X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=514ab54a9f094b94f266a90bdb6495af12df7dec;hb=2b4f2692c6fd8799948e85f2148c4bef2db52e90;hp=f4b9a7ccbb68c5bd5e8c4d696481b4c95e3816fb;hpb=635516adc7915de50d38cd01345871a07a24c390;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index f4b9a7c..514ab54 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -176,7 +176,7 @@ STATIC_ASSERT (rabbittype == 0 && wolftype == 1)
 // utility functions
 
 // TODO: this is slightly incorrect
-inline float roughDirection(XYZ vec)
+float roughDirection(XYZ vec)
 {
     Normalise(&vec);
     float angle = -asin(-vec.x) * 180 / M_PI;
@@ -184,7 +184,7 @@ inline float roughDirection(XYZ vec)
         angle = 180 - angle;
     return angle;
 }
-inline float roughDirectionTo(XYZ start, XYZ end)
+float roughDirectionTo(XYZ start, XYZ end)
 {
     return roughDirection(end - start);
 }
@@ -193,11 +193,11 @@ inline float pitchOf(XYZ vec)
     Normalise(&vec);
     return -asin(vec.y) * 180 / M_PI;
 }
-inline float pitchTo(XYZ start, XYZ end)
+float pitchTo(XYZ start, XYZ end)
 {
     return pitchOf(end - start);
 }
-inline float sq(float n)
+float sq(float n)
 {
     return n * n;
 }
@@ -1958,7 +1958,7 @@ void doAerialAcrobatics()
                                     whichhit = Object::objects[i]->model.LineCheckPossible(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw);
                                     if (Object::objects[i]->friction > .5)
                                         if (whichhit != -1) {
-                                            if (whichhit != -1 && Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim)
+                                            if (Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim)
                                                 Person::players[k]->collided = 1;
                                             if (Object::checkcollide(lowpoint7, lowpointtarget7) == -1)
                                                 if (Object::checkcollide(lowpoint6, lowpointtarget6) == -1)
@@ -4437,7 +4437,7 @@ void Game::TickOnceAfter()
         }
 
         if (changedelay <= 0 && !loading && !editorenabled && gameon && !Tutorial::active && changedelay != -999 && !won) {
-            if (Person::players[0]->dead && changedelay <= 0) {
+            if (Person::players[0]->dead) {
                 changedelay = 1;
                 targetlevel = whichlevel;
             }