[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _mouse.cpp,1.2,1.3 menu.cpp,1.2,1.3 palette.cpp,1.2,1.3 rdwin.cpp,1.3,1.4 render.cpp,1.2,1.3

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv14919/driver

Modified Files:
	_mouse.cpp menu.cpp palette.cpp rdwin.cpp render.cpp 
Log Message:
-Werror cleanup

Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- _mouse.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ _mouse.cpp	28 Jul 2003 07:22:40 -0000	1.3
@@ -161,13 +161,13 @@
 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;
 

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- menu.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ menu.cpp	28 Jul 2003 07:22:40 -0000	1.3
@@ -130,12 +130,13 @@
 {
 	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 @@
 	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 @@
 		}
 	}
 */
+	return RD_OK;
 }
 
 
@@ -480,6 +482,8 @@
 
 	menuStatus[menu] = RDMENU_OPENING;
 
+	return RD_OK;
+
 }
 
 
@@ -497,6 +501,8 @@
 
 	menuStatus[menu] = RDMENU_CLOSING;
 
+	return RD_OK;
+
 }
 
 
@@ -553,6 +559,7 @@
 			return(hr);
 	}
 */
+	return RD_OK;
 }
 
 

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- palette.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ palette.cpp	28 Jul 2003 07:22:40 -0000	1.3
@@ -380,6 +380,8 @@
 	fadeStatus = RDFADE_UP;
 	fadeStartTime = timeGetTime();
 
+	return RD_OK;
+
 }
 
 
@@ -393,6 +395,8 @@
 	fadeTotalTime = (int32) (time * 1000);
 	fadeStatus = RDFADE_DOWN;
 	fadeStartTime = timeGetTime();
+
+	return RD_OK;
 
 }
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rdwin.cpp	28 Jul 2003 05:30:42 -0000	1.3
+++ rdwin.cpp	28 Jul 2003 07:22:40 -0000	1.4
@@ -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;

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- render.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ render.cpp	28 Jul 2003 07:22:40 -0000	1.3
@@ -248,7 +248,7 @@
 static	int16	scrollyTarget;
 static	int16	scrollxOld;
 static	int16	scrollyOld;
-static	uint16	layer = 0;
+//static	uint16	layer = 0;