[Super-tux-commit] supertux/src player.cpp,1.195,1.196 gameobjs.cpp,1.56,1.57
Brought to you by:
wkendrick
From: Ryan F. <sik...@us...> - 2004-11-05 09:10:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31181 Modified Files: player.cpp gameobjs.cpp Log Message: - fixed warnings Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.195 retrieving revision 1.196 diff -u -d -r1.195 -r1.196 --- player.cpp 31 Oct 2004 15:23:11 -0000 1.195 +++ player.cpp 5 Nov 2004 09:10:22 -0000 1.196 @@ -171,7 +171,7 @@ flapping_velocity = 0; // temporary to help player's choosing a flapping - int flapping_mode = MAREK_FLAP; + flapping_mode = MAREK_FLAP; // Ricardo's flapping flaps_nb = 0; @@ -663,6 +663,7 @@ && physic.get_velocity_y() < 0) { float gravity = Sector::current()->gravity; + (void)gravity; float xr = (fabsf(physic.get_velocity_x()) / MAX_RUN_XM); // XXX: magic numbers. should be a percent of gravity Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- gameobjs.cpp 31 Oct 2004 12:08:44 -0000 1.56 +++ gameobjs.cpp 5 Nov 2004 09:10:23 -0000 1.57 @@ -466,7 +466,7 @@ } Particles::Particles(const Vector& epicenter, int min_angle, int max_angle, const Vector& initial_velocity, const Vector& acceleration, int number, Color color_, int size_, int life_time, int drawing_layer_) - : color(color_), size(size_), accel(acceleration), drawing_layer(drawing_layer_) + : accel(acceleration), color(color_), size(size_), drawing_layer(drawing_layer_) { if(life_time == 0) { |