summaryrefslogtreecommitdiffstats
path: root/src/Game.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Game.cpp')
-rw-r--r--src/Game.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Game.cpp b/src/Game.cpp
index f583312..aea829f 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -131,10 +131,10 @@ void Game::run(int delta) {
vmml::vec3f origMove = playerMove;
- bool ok = false;
+ bool collision = true;
- while(!ok) {
- ok = true;
+ while(collision) {
+ collision = false;
MathUtil::Plane nearestPlane;
float nearestDistance;
@@ -150,8 +150,8 @@ void Game::run(int delta) {
vmml::vec3f intersection = p.intersection(MathUtil::Ray(playerPos, playerMove));
float distance = intersection.squared_distance(playerPos);
- if(ok || distance < nearestDistance) {
- ok = false;
+ if(!collision || distance < nearestDistance) {
+ collision = true;
nearestPlane = p;
nearestDistance = distance;
@@ -164,7 +164,7 @@ void Game::run(int delta) {
}
}
- if(!ok) {
+ if(collision) {
vmml::vec3f move;
if(playerMove.dot(nearestPlane.getNormal()) == 0)