Update of /cvsroot/super-tux/supertux/lib/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23297/lib/math
Modified Files:
physic.h physic.cpp
Log Message:
- fixed compile error
Index: physic.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/math/physic.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- physic.h 20 Jul 2004 20:28:28 -0000 1.2
+++ physic.h 20 Jul 2004 22:55:50 -0000 1.3
@@ -65,10 +65,10 @@
void enable_gravity(bool gravity_enabled);
/// Applies the physical simulation to given x and y coordinates.
- void apply(float frame_ratio, float &x, float &y, float& gravity = 10);
+ void apply(float frame_ratio, float &x, float &y, float gravity = 10.0f);
/// applies the physical simulation to given x and y coordinates.
- void apply(Vector& vector, float frame_ratio, float& gravity = 10);
+ void apply(Vector& vector, float frame_ratio, float gravity = 10.0f);
private:
/// horizontal and vertical acceleration
Index: physic.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/math/physic.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- physic.cpp 20 Jul 2004 17:51:36 -0000 1.1
+++ physic.cpp 20 Jul 2004 22:55:50 -0000 1.2
@@ -118,7 +118,7 @@
}
void
-Physic::apply(float elapsed_time, float &x, float &y, float& gravity)
+Physic::apply(float elapsed_time, float &x, float &y, float gravity)
{
float grav;
if(gravity_enabled)
@@ -133,7 +133,7 @@
}
void
-Physic::apply(Vector& vector, float elapsed_time, float& gravity)
+Physic::apply(Vector& vector, float elapsed_time, float gravity)
{
apply(elapsed_time, vector.x, vector.y, gravity);
}
|