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

[Jon Daniel]

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

Modified files:
        src            : playlevel.cpp 

Log message:
        restore what I've messed up

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

Patches:
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.192 wesnoth/src/playlevel.cpp:1.193
--- wesnoth/src/playlevel.cpp:1.192     Wed Mar 23 23:24:09 2005
+++ wesnoth/src/playlevel.cpp   Thu Mar 24 00:11:36 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.192 2005/03/23 23:24:09 j_daniel Exp $ */
+/* $Id: playlevel.cpp,v 1.193 2005/03/24 00:11:36 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -477,44 +477,46 @@
                if(first_player < 0 || first_player >= int(teams.size())) {
                        first_player = 0;
                }
-               events::raise_draw_event();
-               gui.draw();
                
+               events::raise_draw_event();
                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();
+               gui.draw();
                
-               events::raise_draw_event();
                if(!loading_game) {
                        game_events::fire("prestart");
+                       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();
                }
-               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;
                
-               const hotkey::basic_handler key_events_handler(&gui);
-
-               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();
-
-               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) {
+                       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");
+                               }
+                               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();
+                       }
                        player_number = 0;
 
                        gui.new_turn();