libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 22:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

-Werror cleanup

Browse Source 
svn-id: r9230
This commit is contained in:
Jonathan Gray 2003-07-28 07:22:40 +00:00
parent 77cf6b7c3e
commit a05c4bda0f
6 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sword2/driver/_mouse.cpp
View File

@ -161,13 +161,13 @@ int16 mousey;
static uint8 mouseBacklog = 0; static uint8 mouseBacklog = 0;
static uint8 mouseLogPos = 0; static uint8 mouseLogPos = 0;
static uint8 mouseFrame; static uint8 mouseFrame;
static uint8 luggageFrame = 0; //static uint8 luggageFrame = 0;
static uint8 *mouseSprite = NULL; static uint8 *mouseSprite = NULL;
static _mouseAnim *mouseAnim = NULL; static _mouseAnim *mouseAnim = NULL;
static _mouseAnim *luggageAnim = NULL; //static _mouseAnim *luggageAnim = NULL;
static _mouseEvent mouseLog[MAX_MOUSE_EVENTS]; static _mouseEvent mouseLog[MAX_MOUSE_EVENTS];
static int32 *mouseOffsets; static int32 *mouseOffsets;
static int32 *luggageOffset; //static int32 *luggageOffset;
//static LPDIRECTDRAWSURFACE *mouseSurfaces; //static LPDIRECTDRAWSURFACE *mouseSurfaces;
//static LPDIRECTDRAWSURFACE luggageSurface = NULL; //static LPDIRECTDRAWSURFACE luggageSurface = NULL;

15
sword2/driver/menu.cpp
View File

@ -130,12 +130,13 @@ static uint8 menuStatus[2] =
{ {
RDMENU_HIDDEN, RDMENU_HIDDEN RDMENU_HIDDEN, RDMENU_HIDDEN
}; };
/*
static uint8 *icons[2][RDMENU_MAXPOCKETS] = 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,
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] = 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 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}; };
static uint8 menuCounter[2]; //static uint8 menuCounter[2];
static uint8 lastIcon[2]; //static uint8 lastIcon[2];
static uint8 iconCount = 0; //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; menuStatus[menu] = RDMENU_OPENING;
return RD_OK;
} }
@ -497,6 +501,8 @@ int32 HideMenu(uint8 menu)
menuStatus[menu] = RDMENU_CLOSING; menuStatus[menu] = RDMENU_CLOSING;
return RD_OK;
} }
@ -553,6 +559,7 @@ int32 SetMenuIcon(uint8 menu, uint8 pocket, uint8 *icon)
return(hr); return(hr);
} }
*/ */
return RD_OK;
} }

4
sword2/driver/palette.cpp
View File

@ -380,6 +380,8 @@ int32 FadeUp(float time)
fadeStatus = RDFADE_UP; fadeStatus = RDFADE_UP;
fadeStartTime = timeGetTime(); fadeStartTime = timeGetTime();
return RD_OK;
} }
@ -394,6 +396,8 @@ int32 FadeDown(float time)
fadeStatus = RDFADE_DOWN; fadeStatus = RDFADE_DOWN;
fadeStartTime = timeGetTime(); fadeStartTime = timeGetTime();
return RD_OK;
} }

12
sword2/driver/rdwin.cpp
View File

@ -43,13 +43,13 @@
static BOOL bMouseVisible = FALSE; //static BOOL bMouseVisible = FALSE;
static BOOL controlKey = FALSE; //static BOOL controlKey = FALSE;
static BOOL altKey = FALSE; //static BOOL altKey = FALSE;
static BOOL wasScreenSaverActive = FALSE; //static BOOL wasScreenSaverActive = FALSE;
static BOOL myAppClosed = FALSE; //static BOOL myAppClosed = FALSE;
static BOOL controlQDisabled = FALSE; static BOOL controlQDisabled = FALSE;
static uint8 gameName[80]; //static uint8 gameName[80];
//BOOL gotTheFocus = FALSE; //BOOL gotTheFocus = FALSE;

2
sword2/driver/render.cpp
View File

@ -248,7 +248,7 @@ static int16 scrollxTarget;
static int16 scrollyTarget; static int16 scrollyTarget;
static int16 scrollxOld; static int16 scrollxOld;
static int16 scrollyOld; static int16 scrollyOld;
static uint16 layer = 0; //static uint16 layer = 0;

2
sword2/interpreter.cpp
View File

@ -323,7 +323,7 @@ int RunScript ( const char * scriptData , char * objectData , uint32 *offset )
int32 stack2[STACK_SIZE]; // The current stack int32 stack2[STACK_SIZE]; // The current stack
int32 stackPointer2 = 0; // Position within stack int32 stackPointer2 = 0; // Position within stack
int parameterReturnedFromMcodeFunction=0; // Allow scripts to return things 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 // Get the start of variables and start of code
DEBUG3("Enter interpreter data %x, object %x, offset %d",scriptData,objectData,*offset); DEBUG3("Enter interpreter data %x, object %x, offset %d",scriptData,objectData,*offset);