From 4da2d867e24687b29e1f812980664ee1493ad416 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sat, 28 Jan 2017 22:14:01 +0100
Subject: [PATCH] Fix a few GCC5 and GCC6 warnings

---
 Source/Objects/Object.cpp |  3 ++-
 Source/Objects/Person.cpp | 12 ++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Source/Objects/Object.cpp b/Source/Objects/Object.cpp
index 081f23d..a2fcc9e 100644
--- a/Source/Objects/Object.cpp
+++ b/Source/Objects/Object.cpp
@@ -556,7 +556,8 @@ void Object::LoadObjectsFromFile(FILE* tfile, bool skip)
     int numobjects;
     int type;
     XYZ position;
-    float yaw, pitch, scale, lastscale;
+    float yaw, pitch, scale;
+    float lastscale = 1.0f;
     funpackf(tfile, "Bi", &numobjects);
     if (!skip) {
         objects.clear();
diff --git a/Source/Objects/Person.cpp b/Source/Objects/Person.cpp
index 1ac664c..891646a 100644
--- a/Source/Objects/Person.cpp
+++ b/Source/Objects/Person.cpp
@@ -2177,13 +2177,9 @@ void Person::DoAnimations()
         }
         if (animTarget == jumpupanim || animTarget == jumpdownanim || isFlip()) {
             float gLoc[3];
-            float vel[3];
             gLoc[0] = coords.x;
             gLoc[1] = coords.y;
             gLoc[2] = coords.z;
-            vel[0] = velocity.x;
-            vel[1] = velocity.y;
-            vel[2] = velocity.z;
 
             if (id == 0) {
                 OPENAL_3D_SetAttributes(channels[whooshsound], gLoc);
@@ -4800,13 +4796,9 @@ void Person::DoStuff()
 
         if (animTarget == jumpupanim || animTarget == jumpdownanim || isFlip()) {
             float gLoc[3];
-            float vel[3];
             gLoc[0] = coords.x;
             gLoc[1] = coords.y;
             gLoc[2] = coords.z;
-            vel[0] = velocity.x;
-            vel[1] = velocity.y;
-            vel[2] = velocity.z;
 
             if (id == 0) {
                 OPENAL_3D_SetAttributes(channels[whooshsound], gLoc);
@@ -7601,7 +7593,7 @@ void Person::doAI()
         if (aitype == pathfindtype) {
             if (finalpathfindpoint == -1) {
                 float closestdistance;
-                float tempdist;
+                float tempdist = 0.0f;
                 int closest;
                 XYZ colpoint;
                 closest = -1;
@@ -7631,7 +7623,7 @@ void Person::doAI()
             }
             if (targetpathfindpoint == -1) {
                 float closestdistance;
-                float tempdist;
+                float tempdist = 0.0f;
                 int closest;
                 XYZ colpoint;
                 closest = -1;
-- 
2.39.5