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

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index f4b9a7c..f9a3f88 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;
 }
@@ -313,11 +313,12 @@ static int findClosestObject()
     int closest = -1;
     float closestdist = std::numeric_limits<float>::max();
 
-    for (int i = 0; i < Object::objects.size(); i++) {
-        float distance = distsq(&Object::objects[i]->position, &Person::players[0]->coords);
+    for (unsigned int i = 0; i < Object::objects.size(); i++) {
+        float distance = distsq(&Object::objects[i]->position,
+				&Person::players[0]->coords);
         if (distance < closestdist) {
             closestdist = distance;
-            closest = i;
+            closest = (int) i;
         }
     }
     return closest;
@@ -416,8 +417,6 @@ void Setenvironment(int which)
                         "Textures/Skybox(snow)/Down.jpg");
 
 
-
-
         texdetail = temptexdetail;
     } else if (environment == desertenvironment) {
         windvector = 0;
@@ -451,8 +450,6 @@ void Setenvironment(int which)
                         "Textures/Skybox(sand)/Down.jpg");
 
 
-
-
         texdetail = temptexdetail;
     } else if (environment == grassyenvironment) {
         windvector = 0;
@@ -485,7 +482,6 @@ void Setenvironment(int which)
                         "Textures/Skybox(grass)/Down.jpg");
 
 
-
         texdetail = temptexdetail;
     }
     temptexdetail = texdetail;
@@ -579,7 +575,7 @@ void Game::Loadlevel(const std::string& name, bool tutorial)
     freeze = 0;
     winfreeze = 0;
 
-    for (int i = 0; i < 100; i++)
+    for (unsigned char i = 0; i < 100; i++)
         bonusnum[i] = 0;
 
     numfalls = 0;
@@ -981,9 +977,9 @@ void doDevKeys()
 
         /* Grow tree leaves?? */
         if (Input::isKeyPressed(SDL_SCANCODE_Y)) {
-            for (int i = 0; i < Object::objects.size(); i++) {
-                if (Object::objects[i]->type == treeleavestype) {
-                    Object::objects[i]->scale *= .9;
+	    for (auto& an_object : Object::objects) {
+                if (an_object->type == treeleavestype) {
+                    an_object->scale *= .9;
                 }
             }
         }
@@ -1958,7 +1954,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)
@@ -2469,7 +2465,7 @@ void doAttacks()
                                                             terrain.decalalivetime[j] < 2)
                                                         terrain.DeleteDecal(j);
                                                 }
-                                                for (int l = 0; l < Object::objects.size(); l++) {
+                                                for (unsigned int l = 0; l < Object::objects.size(); l++) {
                                                     if (Object::objects[l]->model.type == decalstype)
                                                         for (int j = 0; j < Object::objects[l]->model.numdecals; j++) {
                                                             if ((Object::objects[l]->model.decaltype[j] == blooddecal ||
@@ -2495,7 +2491,7 @@ void doAttacks()
                                                             terrain.DeleteDecal(j);
                                                         }
                                                     }
-                                                    for (int l = 0; l < Object::objects.size(); l++) {
+                                                    for (unsigned int l = 0; l < Object::objects.size(); l++) {
                                                         if (Object::objects[l]->model.type == decalstype)
                                                             for (int j = 0; j < Object::objects[l]->model.numdecals; j++) {
                                                                 if ((Object::objects[l]->model.decaltype[j] == blooddecal ||
@@ -3411,7 +3407,7 @@ void Game::Tick()
                     Person::players[i]->avoidsomething = 0;
 
                     //avoid flaming things
-                    for (int j = 0; j < Object::objects.size(); j++)
+                    for (unsigned int j = 0; j < Object::objects.size(); j++)
                         if (Object::objects[j]->onfire)
                             if (distsq(&Person::players[i]->coords, &Object::objects[j]->position) < sq(Object::objects[j]->scale) * 200)
                                 if (     distsq(&Person::players[i]->coords, &Object::objects[j]->position) <
@@ -4437,7 +4433,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;
             }