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

Fix some compiler warnings.

Browse source
This commit is contained in:
Mark de Wever 2010-04-19 19:19:19 +00:00
parent 095941f93d
commit 3b46f103db
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game.cpp
View file

@ -272,8 +272,8 @@ game_controller::game_controller(int argc, char** argv) :
loaded_game_show_replay_(false),
loaded_game_cancel_orders_(false),
multiplayer_server_(),
jump_to_campaign_(false,-1,"",""),
jump_to_multiplayer_(false)
jump_to_multiplayer_(false),
jump_to_campaign_(false,-1,"","")
#ifndef DISABLE_EDITOR
,jump_to_editor_(false)
#endif
@ -1081,7 +1081,7 @@ bool game_controller::new_campaign()
// if we should quit the game or return to the main menu
// checking for valid campaign name
for(int i=0;i<campaigns.size();++i)
for(size_t i = 0; i < campaigns.size(); ++i)
{
if (campaigns[i]["id"] == jump_to_campaign_.campaign_id_)
{
@ -1148,7 +1148,8 @@ bool game_controller::new_campaign()
}
else
{
if (jump_to_campaign_.difficulty_ > difficulties.size())
if (jump_to_campaign_.difficulty_
> static_cast<int>(difficulties.size()))
{
std::cerr<<"incorrect difficulty number: ["<<jump_to_campaign_.difficulty_<<"]. maximum is ["<<difficulties.size()<<"].\n";
return false;