[Super-tux-commit] supertux/src sector.cpp,1.30,1.31 level.cpp,1.101,1.102
Brought to you by:
wkendrick
From: Ryan F. <sik...@us...> - 2004-09-21 22:03:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4330 Modified Files: sector.cpp level.cpp Log Message: - fixed warnings pointed out by Frank Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- level.cpp 17 Sep 2004 12:22:40 -0000 1.101 +++ level.cpp 21 Sep 2004 22:03:32 -0000 1.102 @@ -172,8 +172,8 @@ { int total_coins = 0; for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it) - for(int x = 0; x < it->second->solids->get_width(); x++) - for(int y = 0; y < it->second->solids->get_height(); y++) + for(int x = 0; static_cast<unsigned int>(x) < it->second->solids->get_width(); x++) + for(int y = 0; static_cast<unsigned int>(y) < it->second->solids->get_height(); y++) if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN) total_coins++; return total_coins; Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- sector.cpp 20 Sep 2004 19:57:47 -0000 1.30 +++ sector.cpp 21 Sep 2004 22:03:32 -0000 1.31 @@ -45,8 +45,9 @@ Sector* Sector::_current = 0; Sector::Sector() - : gravity(10), player(0), solids(0), background(0), camera(0), - end_sequence_animation_type(NONE_ENDSEQ_ANIM), currentmusic(LEVEL_MUSIC) + : end_sequence_animation_type(NONE_ENDSEQ_ANIM), + gravity(10), player(0), solids(0), background(0), camera(0), + currentmusic(LEVEL_MUSIC) { song_title = "Mortimers_chipdisko.mod"; player = new Player(); |