-Werror cleanup

svn-id: r9230

1 files changed, 11 insertions, 4 deletions

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;
 }