[Wesnoth-cvs-commits] wesnoth/src playlevel.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/23 23:24:09

Modified files:
        src            : playlevel.cpp 

Log message:
        second part of fix for bug #12101. fixes also messages are drawn ontop 
story in case of a prestart event

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

Patches:
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.191 wesnoth/src/playlevel.cpp:1.192
--- wesnoth/src/playlevel.cpp:1.191     Wed Mar 23 18:11:52 2005
+++ wesnoth/src/playlevel.cpp   Wed Mar 23 23:24:09 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.191 2005/03/23 18:11:52 j_daniel Exp $ */
+/* $Id: playlevel.cpp,v 1.192 2005/03/23 23:24:09 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -457,10 +457,7 @@
                
                gui.begin_game();
                gui.adjust_colours(0,0,0);
-
-               if(!loading_game) {
-                       game_events::fire("prestart");
-               }
+               
 
                LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks) << "\n";
                if(first_human_team != -1) {
@@ -480,33 +477,45 @@
                if(first_player < 0 || first_player >= int(teams.size())) {
                        first_player = 0;
                }
-
-               LOG_NG << "starting main loop\n" << (SDL_GetTicks() - ticks) << 
"\n";
+               events::raise_draw_event();
+               gui.draw();
+               
+               for(std::vector<team>::iterator t = teams.begin(); t != 
teams.end(); ++t) {
+                       
clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
+               }
+               gui.recalculate_minimap();
+               
+               events::raise_draw_event();
+               if(!loading_game) {
+                       game_events::fire("prestart");
+               }
+               gui.draw();
+               
+               for(std::vector<team>::iterator t = teams.begin(); t != 
teams.end(); ++t) {
+                       
clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
+               }
+               gui.recalculate_minimap();
 
                std::deque<config> data_backlog;
                
-               for(bool first_time = true; true; first_time = false, 
first_player = 0) {
-                       player_number = 0;
-
-                       if(first_time) {
-                               const hotkey::basic_handler 
key_events_handler(&gui);
-
-                               LOG_NG << "first_time..." << 
(recorder.skipping() ? "skipping" : "no skip") << "\n";
-                               update_locker 
lock_display(gui.video(),recorder.skipping());
-                               events::raise_draw_event();
-                               if(!loading_game) {
-                                       game_events::fire("start");
-                                       
game_events::set_variable("turn_number", "1");
-                               }
+               const hotkey::basic_handler key_events_handler(&gui);
 
-                               gui.draw();
-                               
-                               for(std::vector<team>::iterator t = 
teams.begin(); t != teams.end(); ++t) {
-                                       
clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
-                               }
+               LOG_NG << "first_time..." << (recorder.skipping() ? "skipping" 
: "no skip") << "\n";
+               events::raise_draw_event();
+               if(!loading_game) {
+                       game_events::fire("start");
+                       game_events::set_variable("turn_number", "1");
+               }
+               gui.draw();
 
-                               gui.recalculate_minimap();
-                       }
+               for(std::vector<team>::iterator t = teams.begin(); t != 
teams.end(); ++t) {
+                       
clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
+               }
+               gui.recalculate_minimap();
+               
+               LOG_NG << "starting main loop\n" << (SDL_GetTicks() - ticks) << 
"\n";
+               for(bool first_time = true; true; first_time = false, 
first_player = 0) {
+                       player_number = 0;
 
                        gui.new_turn();
                        gui.invalidate_game_status();