From a47f1c619af3dba76e0f44747da21db39471446e Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 27 Nov 2003 04:52:18 +0000
Subject: [PATCH] fix gcc 3.3 compiler warnings

---
 ChangeLog          |  3 +++
 libmve/decoder16.c | 15 ++++++++-------
 libmve/mve_main.c  |  3 ++-
 main/newmenu.c     |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67c412b4..0fdaccb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-26  Bradley Bell  <btb@icculus.org>
 
+	* libmve/decoder16.c, libmve/mve_main.c, main/newmenu.c: fix gcc
+	3.3 compiler warnings
+
 	* arch/sdl/gr.c, main/kludge.c: landscape fixes, implemented
 	gr_check_mode
 
diff --git a/libmve/decoder16.c b/libmve/decoder16.c
index a7150c1f..4cc1dea4 100644
--- a/libmve/decoder16.c
+++ b/libmve/decoder16.c
@@ -17,6 +17,7 @@ void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, un
     unsigned char *pOrig;
     unsigned char *pOffData, *pEnd;
     unsigned short offset;
+    unsigned short *FramePtr = (unsigned short *)pFrame;
     int length;
     int op;
     int i, j;
@@ -47,22 +48,22 @@ void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, un
         for (i=0; i<xb/2; i++)
         {
             op = (*pMap) & 0xf;
-            dispatchDecoder16((unsigned short **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+            dispatchDecoder16(&FramePtr, op, &pData, &pOffData, &dataRemain, &i, &j);
 
 			/*
-			  if ((unsigned short *)pFrame < backBuf1)
+			  if (FramePtr < backBuf1)
 			  fprintf(stderr, "danger!  pointing out of bounds below after dispatch decoder: %d, %d (1) [%x]\n", i, j, (*pMap) & 0xf);
-			  else if ((unsigned short *)pFrame >= backBuf1 + g_width*g_height)
+			  else if (FramePtr >= backBuf1 + g_width*g_height)
 			  fprintf(stderr, "danger!  pointing out of bounds above after dispatch decoder: %d, %d (1) [%x]\n", i, j, (*pMap) & 0xf);
 			*/
 
 			op = ((*pMap) >> 4) & 0xf;
-            dispatchDecoder16((unsigned short **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+            dispatchDecoder16(&FramePtr, op, &pData, &pOffData, &dataRemain, &i, &j);
 
 			/*
-			  if ((unsigned short *)pFrame < backBuf1)
+			  if (FramePtr < backBuf1)
 			  fprintf(stderr, "danger!  pointing out of bounds below after dispatch decoder: %d, %d (2) [%x]\n", i, j, (*pMap) >> 4);
-			  else if ((unsigned short *)pFrame >= backBuf1 + g_width*g_height)
+			  else if (FramePtr >= backBuf1 + g_width*g_height)
 			  fprintf(stderr, "danger!  pointing out of bounds above after dispatch decoder: %d, %d (2) [%x]\n", i, j, (*pMap) >> 4);
 			*/
 
@@ -70,7 +71,7 @@ void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, un
             --mapRemain;
         }
 
-        pFrame += 7*g_width*2;
+        FramePtr += 7*g_width;
     }
 
     if ((length-(pData-pOrig)) != 0) {
diff --git a/libmve/mve_main.c b/libmve/mve_main.c
index 0b68d9d8..fb33c5c0 100644
--- a/libmve/mve_main.c
+++ b/libmve/mve_main.c
@@ -1,6 +1,7 @@
-/* $Id: mve_main.c,v 1.6 2003-11-26 12:26:28 btb Exp $ */
+/* $Id: mve_main.c,v 1.7 2003-11-27 04:52:18 btb Exp $ */
 
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <string.h>
 
diff --git a/main/newmenu.c b/main/newmenu.c
index 9bc94e90..16e0d443 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -1,4 +1,4 @@
-/* $Id: newmenu.c,v 1.24 2003-11-26 12:26:31 btb Exp $ */
+/* $Id: newmenu.c,v 1.25 2003-11-27 04:52:18 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1307,7 +1307,7 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item,
 	WINDOS(dd_grs_canvas *save_canvas, grs_canvas *save_canvas );	
 #ifdef NEWMENU_MOUSE
 	int mouse_state, omouse_state, dblclick_flag=0;
-	int mx=0, my=0, x1, x2, y1, y2;
+	int mx=0, my=0, x1 = 0, x2, y1, y2;
 	int close_box=0;
 #endif
 #ifdef MACINTOSH
-- 
2.39.2