removed all ../ entries and made a basic inc path (dependencies are currently broke)

[physics.git] / src / Effects / Screen.cpp

diff --git a/src/Effects/Screen.cpp b/src/Effects/Screen.cpp
index e4ef901..9c0f283 100644 (file)
--- a/src/Effects/Screen.cpp
+++ b/src/Effects/Screen.cpp
@@ -17,8 +17,8 @@
 
 #include "Screen.h"
 
-#include "../Entities/PhysicsEntity.h"
-#include "../Entities/Ball.h"
+#include "Entities/PhysicsEntity.h"
+#include "Entities/Ball.h"
 
 
 /// ***** Constructors/Destructors *****
@@ -37,7 +37,6 @@ Screen::~Screen()
 Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
 {
     const Vector2& pos = e->positionRaw();
-    const Vector2& velo = e->velocityRaw();
 
     Vector2 acc(0,0);
 
@@ -47,16 +46,16 @@ Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
         radius = b->getRadius();
 
 
-    if(pos.y > 600-radius && velo.y > 0)
+    if(pos.y > 600-radius)
         acc.y += 600-radius - pos.y;
 
-    if(pos.y < 0+radius && velo.y < 0)
+    if(pos.y < 0+radius)
         acc.y += 0+radius - pos.y;
 
-    if(pos.x > 800-radius && velo.x > 0)
+    if(pos.x > 800-radius)
         acc.x += 800-radius - pos.x;
 
-    if(pos.x < 0+radius && velo.x < 0)
+    if(pos.x < 0+radius)
         acc.x += 0+radius - pos.x;
 
     return acc;