-Werror cleanup

svn-id: r9230

6 files changed, 26 insertions, 15 deletions

diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 8d9cd36769..9df9104e99 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -161,13 +161,13 @@ int16				mousey;
 static	uint8		mouseBacklog = 0;
 static	uint8		mouseLogPos = 0;
 static	uint8		mouseFrame;
-static	uint8		luggageFrame = 0;
+//static	uint8		luggageFrame = 0;
 static	uint8		*mouseSprite = NULL;
 static	_mouseAnim	*mouseAnim = NULL;
-static	_mouseAnim	*luggageAnim = NULL;
+//static	_mouseAnim	*luggageAnim = NULL;
 static	_mouseEvent	mouseLog[MAX_MOUSE_EVENTS];
 static  int32		*mouseOffsets;
-static	int32		*luggageOffset;
+//static	int32		*luggageOffset;
 //static	LPDIRECTDRAWSURFACE	*mouseSurfaces;
 //static	LPDIRECTDRAWSURFACE luggageSurface = NULL;
 
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index 16efa5a53d..d615d8300f 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -130,12 +130,13 @@ static uint8 menuStatus[2] =
 {
 	RDMENU_HIDDEN, RDMENU_HIDDEN
 };
-
+/*
 static uint8 *icons[2][RDMENU_MAXPOCKETS] =
 {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
+*/
 
 /*
 static LPDIRECTDRAWSURFACE lpIconSurface[2][RDMENU_MAXPOCKETS] = 
@@ -151,9 +152,9 @@ static uint8 pocketStatus[2][RDMENU_MAXPOCKETS] =
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static uint8 menuCounter[2];
-static uint8 lastIcon[2];
-static uint8 iconCount = 0;
+//static uint8 menuCounter[2];
+//static uint8 lastIcon[2];
+//static uint8 iconCount = 0;
 
 
 
@@ -463,6 +464,7 @@ int32 ProcessMenu(void)
 		}
 	}
 */
+	return RD_OK;
 }
 
 
@@ -480,6 +482,8 @@ int32 ShowMenu(uint8 menu)
 
 	menuStatus[menu] = RDMENU_OPENING;
 
+	return RD_OK;
+
 }
 
 
@@ -497,6 +501,8 @@ int32 HideMenu(uint8 menu)
 
 	menuStatus[menu] = RDMENU_CLOSING;
 
+	return RD_OK;
+
 }
 
 
@@ -553,6 +559,7 @@ int32 SetMenuIcon(uint8 menu, uint8 pocket, uint8 *icon)
 			return(hr);
 	}
 */
+	return RD_OK;
 }
 
 
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index ae097ce0c1..bdead2f12d 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -380,6 +380,8 @@ int32 FadeUp(float time)
 	fadeStatus = RDFADE_UP;
 	fadeStartTime = timeGetTime();
 
+	return RD_OK;
+
 }
 
 
@@ -394,6 +396,8 @@ int32 FadeDown(float time)
 	fadeStatus = RDFADE_DOWN;
 	fadeStartTime = timeGetTime();
 
+	return RD_OK;
+
 }
 
 
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index d3d6002b37..8791a793fa 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -43,13 +43,13 @@
 
 
 
-static BOOL		bMouseVisible = FALSE;
-static BOOL		controlKey = FALSE;
-static BOOL		altKey = FALSE;
-static BOOL		wasScreenSaverActive = FALSE;
-static BOOL		myAppClosed = FALSE;
+//static BOOL		bMouseVisible = FALSE;
+//static BOOL		controlKey = FALSE;
+//static BOOL		altKey = FALSE;
+//static BOOL		wasScreenSaverActive = FALSE;
+//static BOOL		myAppClosed = FALSE;
 static BOOL		controlQDisabled = FALSE;
-static uint8	gameName[80];
+//static uint8	gameName[80];
 
 
 //BOOL			gotTheFocus = FALSE;
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index dda0137a44..acbff2fdbd 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -248,7 +248,7 @@ static	int16	scrollxTarget;
 static	int16	scrollyTarget;
 static	int16	scrollxOld;
 static	int16	scrollyOld;
-static	uint16	layer = 0;
+//static	uint16	layer = 0;
 
 
 
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index d1a0d3e247..f7a5d51868 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -323,7 +323,7 @@ int RunScript ( const char * scriptData , char * objectData , uint32 *offset )
 	int32 stack2[STACK_SIZE];						// The current stack
 	int32 stackPointer2 = 0;						// Position within stack
 	int parameterReturnedFromMcodeFunction=0;	// Allow scripts to return things
-	int savedStartOfMcode;						// For saving start of mcode commands
+	int savedStartOfMcode=0;			// For saving start of mcode commands
 
 	// Get the start of variables and start of code
 	DEBUG3("Enter interpreter data %x, object %x, offset %d",scriptData,objectData,*offset);