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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/09/05 19:05:50

Modified files:
        src            : playturn.cpp 

Log message:
        Fixed some "branch on initialized variable" errors.

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

Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.395 wesnoth/src/playturn.cpp:1.396
--- wesnoth/src/playturn.cpp:1.395      Sat Aug 27 22:52:54 2005
+++ wesnoth/src/playturn.cpp    Mon Sep  5 19:05:47 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.395 2005/08/27 22:52:54 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.396 2005/09/05 19:05:47 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -152,8 +152,10 @@
     key_(key), gui_(gui), map_(map), teams_(teams), team_num_(team_num),
     units_(units), browse_(mode != PLAY_TURN), allow_network_commands_(mode == 
BROWSE_NETWORKED),
     left_button_(false), right_button_(false), middle_button_(false),
-       minimap_scrolling_(false), enemy_paths_(false), 
last_nearest_(gamemap::location::NORTH), 
last_second_nearest_(gamemap::location::NORTH),
-    path_turns_(0), end_turn_(false), start_ncmd_(-1), textbox_(textbox), 
replay_sender_(replay_sender)
+       minimap_scrolling_(false), enemy_paths_(false), 
+       last_nearest_(gamemap::location::NORTH), 
+       last_second_nearest_(gamemap::location::NORTH),
+       path_turns_(0), end_turn_(false), start_ncmd_(-1), textbox_(textbox), 
replay_sender_(replay_sender)
 {
        enemies_visible_ = enemies_visible();
 
@@ -310,7 +312,8 @@
                if(minimap_scrolling_) return;
        }
 
-       gamemap::location::DIRECTION nearest_hex, second_nearest_hex;
+       gamemap::location::DIRECTION nearest_hex = 
gamemap::location::NDIRECTIONS;
+       gamemap::location::DIRECTION second_nearest_hex = 
gamemap::location::NDIRECTIONS;
        const team& current_team = teams_[team_num_-1];
        const gamemap::location new_hex = 
gui_.hex_clicked_on(x,y,&nearest_hex,&second_nearest_hex);