projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Had to change the #includes of dependend headers from "dir/header.h" to "../dir...
[supertux.git]
/
lib
/
math
/
physic.cpp
diff --git
a/lib/math/physic.cpp
b/lib/math/physic.cpp
index
09568f8
..
0873cde
100644
(file)
--- a/
lib/math/physic.cpp
+++ b/
lib/math/physic.cpp
@@
-20,8
+20,10
@@
#include <cstdio>
#include <cstdio>
-#include "math/physic.h"
-#include "special/timer.h"
+#include "../math/physic.h"
+#include "../special/timer.h"
+
+using namespace SuperTux;
Physic::Physic()
: ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
Physic::Physic()
: ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
@@
-118,7
+120,7
@@
Physic::enable_gravity(bool enable_gravity)
}
void
}
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)
{
float grav;
if(gravity_enabled)
@@
-133,7
+135,7
@@
Physic::apply(float elapsed_time, float &x, float &y, float& gravity)
}
void
}
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);
}
{
apply(elapsed_time, vector.x, vector.y, gravity);
}