[Wesnoth-cvs-commits] wesnoth/src game.cpp map.cpp (December 08, 2004 - 04:12)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	David White <davidnwhite@xxxxxxxxxxxxxxx>	04/12/08 02:09:56

Modified files:
	src            : game.cpp map.cpp 

Log message:
	made it so a restart isn't needed before campaigns downloaded from the campaign server appear

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.174&tr2=1.175&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.174 wesnoth/src/game.cpp:1.175
--- wesnoth/src/game.cpp:1.174	Tue Dec  7 18:02:32 2004
+++ wesnoth/src/game.cpp	Wed Dec  8 02:09:56 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.174 2004/12/07 18:02:32 silene Exp $ */
+/* $Id: game.cpp,v 1.175 2004/12/08 02:09:56 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1142,8 +1142,9 @@
 
 		//force a reload of configuration information
 		const bool old_cache = use_caching_;
-		use_caching_ = false;
-		init_config();
+		use_caching_ = false;
+		old_defines_map_.clear();
+		refresh_game_cfg();
 		use_caching_ = old_cache;
 
 		gui::show_dialog(disp(),NULL,_("Campaign Installed"),_("The campaign has been installed."),gui::OK_ONLY);
Index: wesnoth/src/map.cpp
diff -u wesnoth/src/map.cpp:1.43 wesnoth/src/map.cpp:1.44
--- wesnoth/src/map.cpp:1.43	Thu Nov 18 22:00:12 2004
+++ wesnoth/src/map.cpp	Wed Dec  8 02:09:56 2004
@@ -1,4 +1,4 @@
-/* $Id: map.cpp,v 1.43 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: map.cpp,v 1.44 2004/12/08 02:09:56 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -190,7 +190,7 @@
 					c = KEEP;
 				} else {
 					std::cerr << "Illegal character in map: (" << int(c) << ") '" << c << "'\n";
-					throw incorrect_format_exception("Illegal character");
+					throw incorrect_format_exception("Illegal character found in map. The scenario cannot be loaded.");
 				}
 			}
 



You are on the gna.org mail server.

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