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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/04/12 21:40:17

Modified files:
        src            : playlevel.cpp game_events.cpp 

Log message:
        Fixed bug #12654 causing prestart events to be shown to the player

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.199&tr2=1.200&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.141&tr2=1.142&r1=text&r2=text

Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.141 wesnoth/src/game_events.cpp:1.142
--- wesnoth/src/game_events.cpp:1.141   Fri Apr  1 13:41:10 2005
+++ wesnoth/src/game_events.cpp Tue Apr 12 21:40:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.141 2005/04/01 13:41:10 j_daniel Exp $ */
+/* $Id: game_events.cpp,v 1.142 2005/04/12 21:40:16 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -943,12 +943,6 @@
                        }
 
                        screen->invalidate(loc);
-                       // need to redraw here because unit might be in a 
prestart event
-                       for(std::vector<team>::iterator t = teams->begin(); t 
!= teams->end(); ++t) {
-                               clear_shroud(*screen, *status_ptr, *game_map, 
*game_data_ptr, *units, *teams, (t - teams->begin()));
-                       }
-                       screen->draw();
-                       screen->recalculate_minimap();
                } else {
                        player_info* const player = 
state_of_game->get_player((*teams)[new_unit.side()-1].save_id());
 
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.199 wesnoth/src/playlevel.cpp:1.200
--- wesnoth/src/playlevel.cpp:1.199     Mon Mar 28 19:08:58 2005
+++ wesnoth/src/playlevel.cpp   Tue Apr 12 21:40:16 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.199 2005/03/28 19:08:58 gruikya Exp $ */
+/* $Id: playlevel.cpp,v 1.200 2005/04/12 21:40:16 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -467,16 +467,13 @@
                gui.begin_game();
                gui.adjust_colours(0,0,0);
                
-
                LOG_NG << "scrolling... " << (SDL_GetTicks() - ticks) << "\n";
                if(first_human_team != -1) {
-                       
clear_shroud(gui,status,map,gameinfo,units,teams,first_human_team);
                        LOG_NG << "b " << (SDL_GetTicks() - ticks) << "\n";
                        
gui.scroll_to_tile(map.starting_position(first_human_team + 1).x,
                                           
map.starting_position(first_human_team + 1).y, display::WARP);
                        LOG_NG << "c " << (SDL_GetTicks() - ticks) << "\n";
                }
-       
                
gui.scroll_to_tile(map.starting_position(1).x,map.starting_position(1).y,display::WARP);
                LOG_NG << "done scrolling... " << (SDL_GetTicks() - ticks) << 
"\n";
 
@@ -487,23 +484,12 @@
                        first_player = 0;
                }
                
-               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();
-               
                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();
                }
-               
+               for(std::vector<team>::iterator t = teams.begin(); t != 
teams.end(); ++t) {
+                       
clear_shroud(gui,status,map,gameinfo,units,teams,(t-teams.begin()));
+               }
 
                std::deque<config> data_backlog;