AVALANCHE: Fix more GCC warnings

1 files changed, 3 insertions, 20 deletions

diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 3caa946eb2..971fbbdfc0 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -45,16 +45,10 @@ class AvalancheEngine;
 
 static const char numobjs = 18; /* always preface with a # */
 static const int16 maxobjs = 12;  /* carry limit */
-static const byte howlong = 1/*8*/; /* 18 ticks. */
-
-static const int16 num = 32;  /* Code for Num Lock */
 
+static const int16 numlockCode = 32;  /* Code for Num Lock */
 static const int16 mouse_size = 134;
 
-
-
-typedef void (*proc)();
-
 struct postype {
 	uint16 x, y, datapos;
 	byte length;
@@ -282,17 +276,6 @@ struct ednahead { /* Edna header */
 	/* DNA values follow, then footer (which is ignored) */
 };
 
-/* Possible values of edhead.os:
-	1 = DOS        4 = Mac
-	2 = Windows    5 = Amiga
-	3 = OS/2       6 = ST
-	7 = Archimedes */
-
-
-
-
-
-
 class Gyro {
 public:
 	static const char *vernum;
@@ -535,7 +518,7 @@ public:
 	Common::String flags;
 	Common::String listen;
 
-	uint16 oh, onh, om, h, m, s, s1;
+	uint16 oh, onh, om, hour, minutes, seconds;
 
 	Common::String atkey; /* For XTs, set to "alt-". For ATs, set to "f1". */
 
@@ -612,7 +595,7 @@ public:
 
 	Common::String strf(int32 x);
 
-	void newpointer(byte m);
+	void newpointer(byte id);
 
 	void wait();    // Makes hourglass.