[Wesnoth-cvs-commits] wesnoth/src game.cpp (December 04, 2004 - 19:44)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	Guillaume Melquiond <guillaume.melquiond@xxxxxxxxx>	04/12/04 18:38:30

Modified files:
	src            : game.cpp 

Log message:
	Mistakenly put a column separator instead of a help string separator.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.171&tr2=1.172&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.171 wesnoth/src/game.cpp:1.172
--- wesnoth/src/game.cpp:1.171	Sat Dec  4 01:30:30 2004
+++ wesnoth/src/game.cpp	Sat Dec  4 18:38:30 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.171 2004/12/04 01:30:30 Sirp Exp $ */
+/* $Id: game.cpp,v 1.172 2004/12/04 18:38:30 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1232,12 +1232,12 @@
 
 	std::vector<std::string> host_or_join;
 	std::string const pre = IMAGE_PREFIX + std::string("icons/icon-");
-	char const sep = COLUMN_SEPARATOR;
-	host_or_join.push_back(pre + "server.png" + sep + _("Join Official Server") + sep + _("Log on to the official Wesnoth multiplayer server"));
-	host_or_join.push_back(pre + "serverother.png" + sep + _("Join Game") + sep + _("Join a server or hosted game"));
-	host_or_join.push_back(pre + "hostgame.png" + sep + _("Host Networked Game") + sep + _("Host a game without using a server"));
-	host_or_join.push_back(pre + "hotseat.png" + sep + _("Hotseat Game") + sep + _("Play a multiplayer game sharing the same machine"));
-	host_or_join.push_back(pre + "ai.png" + sep + _("Human vs AI") + sep + _("Play a game against AI opponents"));
+	char const sep1 = COLUMN_SEPARATOR, sep2 = HELP_STRING_SEPARATOR;
+	host_or_join.push_back(pre + "server.png" + sep1 + _("Join Official Server") + sep2 + _("Log on to the official Wesnoth multiplayer server"));
+	host_or_join.push_back(pre + "serverother.png" + sep1 + _("Join Game") + sep2 + _("Join a server or hosted game"));
+	host_or_join.push_back(pre + "hostgame.png" + sep1 + _("Host Networked Game") + sep2 + _("Host a game without using a server"));
+	host_or_join.push_back(pre + "hotseat.png" + sep1 + _("Hotseat Game") + sep2 + _("Play a multiplayer game sharing the same machine"));
+	host_or_join.push_back(pre + "ai.png" + sep1 + _("Human vs AI") + sep2 + _("Play a game against AI opponents"));
 
 	std::string login = preferences::login();
 	const int res = gui::show_dialog(disp(),NULL,_("Multiplayer"),"",gui::OK_CANCEL,&host_or_join,NULL,_("Login") + std::string(": "),&login);



You are on the gna.org mail server.

Generated by mhonarc, Tue Sep 20 16:45:15 2005