Fixed lots of errors spotted by cppcheck

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 56fa29ee4cbce68f5e469018b9593788891b2a83..af0eb18561371085d221b4b53572ad92529dfe73 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
@@ -463,10 +461,10 @@ int Game::DrawGLScene(StereoSide side)
                     if (distance >= .5) {
                         checkpoint = DoRotation(Person::players[k]->skeleton.joints[abs(Random() % Person::players[k]->skeleton.num_joints)].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                         checkpoint.y += 1;
-                        int i;
-                        if (!Person::players[k]->occluded == 0)
+                        int i = -1;
+                        if (Person::players[k]->occluded != 0)
                             i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
-                        if (i == -1 || Person::players[k]->occluded == 0)
+                        if (i == -1)
                             i = checkcollide(viewer, checkpoint);
                         if (i != -1) {
                             Person::players[k]->occluded += 1;
@@ -528,10 +526,10 @@ int Game::DrawGLScene(StereoSide side)
                 if (distance >= .5) {
                     checkpoint = DoRotation(Person::players[k]->skeleton.joints[abs(Random() % Person::players[k]->skeleton.num_joints)].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                     checkpoint.y += 1;
-                    int i;
-                    if (!Person::players[k]->occluded == 0)
+                    int i = -1;
+                    if (Person::players[k]->occluded != 0)
                         i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
-                    if (i == -1 || Person::players[k]->occluded == 0)
+                    if (i == -1)
                         i = checkcollide(viewer, checkpoint);
                     if (i != -1) {
                         Person::players[k]->occluded += 1;
@@ -933,10 +931,9 @@ int Game::DrawGLScene(StereoSide side)
             //Hot spots
 
             if (numhotspots && (bonustime >= 1 || bonus <= 0 || bonustime < 0) && !tutoriallevel) {
-                int closest = -1;
                 float closestdist = -1;
                 float distance = 0;
-                closest = currenthotspot;
+                int closest = currenthotspot;
                 for (int i = 0; i < numhotspots; i++) {
                     distance = distsq(&Person::players[0]->coords, &hotspot[i]);
                     if (closestdist == -1 || distance < closestdist) {
@@ -1517,8 +1514,6 @@ int Game::DrawGLScene(StereoSide side)
                     }
                 }
             }
-            radius = fast_sqrt(maxdistance);
-
             radius = 110;
 
             glScalef(.25 / radius * 256 * terrain.scale * .4, .25 / radius * 256 * terrain.scale * .4, 1);