[Wesnoth-cvs-commits] wesnoth/src playlevel.cpp (August 24, 2005 - 22:49)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	Philippe Plantier <gruikya@xxxxxxxxxxxxxxxx>	05/08/24 20:37:57

Modified files:
	src            : playlevel.cpp 

Log message:
	This should fix bug #12957. And not introduce any new bug (hopefully).

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

Patches:
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.212 wesnoth/src/playlevel.cpp:1.213
--- wesnoth/src/playlevel.cpp:1.212	Fri Aug  5 14:11:46 2005
+++ wesnoth/src/playlevel.cpp	Wed Aug 24 20:37:55 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.212 2005/08/05 14:11:46 j_daniel Exp $ */
+/* $Id: playlevel.cpp,v 1.213 2005/08/24 20:37:55 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -473,6 +473,12 @@
 		//instead of starting a fresh one
 		const bool loading_game = lvl["playing_team"].empty() == false;
 
+		//pre-start events must be executed before any GUI operation,
+		//as those may cause the display to be refreshed.
+		if(!loading_game) {
+			game_events::fire("prestart");
+		}
+
 		gui.begin_game();
 		gui.adjust_colours(0,0,0);
 
@@ -493,9 +499,6 @@
 			first_player = 0;
 		}
 
-		if(!loading_game) {
-			game_events::fire("prestart");
-		}
 		for(std::vector<team>::iterator t = teams.begin(); t != teams.end(); ++t) {
 			clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
 		}



You are on the gna.org mail server.

Generated by mhonarc, Tue Sep 20 16:52:46 2005