0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit variable scope.

Browse source 
Also removes an old-style cast. Issue found by cppcheck.
This commit is contained in:
Mark de Wever 2011-09-04 16:52:11 +00:00
parent 1947e50f15
commit 4ae425d811
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/multiplayer_wait.cpp
View file

@ -254,7 +254,6 @@ void wait::join_game(bool observe)
//if the client is allowed to choose their team, instead of having
//it set by the server, do that here.
std::string leader_choice, gender_choice;
int faction_choice = 0;
if(allow_changes) {
events::event_context context;
@ -316,11 +315,11 @@ void wait::join_game(bool observe)
set_result(QUIT);
return;
}
faction_choice = res;
const int faction_choice = res;
leader_choice = leader_selector.get_selected_leader();
gender_choice = leader_selector.get_selected_gender();
assert(unsigned(faction_choice) < leader_sides.size());
assert(static_cast<unsigned>(faction_choice) < leader_sides.size());
config faction;
config& change = faction.add_child("change_faction");