Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Splint found mistakes. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1660 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-05-19 23:01:56 +00:00
parent d1ce4ba663
commit 6226dfe37c
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clparse.h
View File

@ -41,14 +41,14 @@ extern BOOL bAllowDebugMode;
*
* \param fpsLimit Desired framerate
*/
extern void setFramerateLimit(Uint32 fpsLimit);
extern void setFramerateLimit(int fpsLimit);
/*!
* Get the framerate limit
*
* \return Desired framerate
*/
extern Uint32 getFramerateLimit(void);
extern int getFramerateLimit(void);
#endif

4
src/loop.c
View File

@ -676,7 +676,7 @@ GAMECODE gameLoop(void)
}
/* The video playback loop */
GAMECODE videoLoop(void)
void videoLoop(void)
{
BOOL bVolKilled = FALSE;
@ -802,8 +802,6 @@ GAMECODE videoLoop(void)
{
mixer_SetWavVolume( g_iGlobalVol );
}
return GAMECODE_CONTINUE;
}

2
src/loop.h
View File

@ -61,7 +61,7 @@ extern SDWORD loopPolyCount;
extern SDWORD loopStateChanges;
extern GAMECODE gameLoop(void);
extern GAMECODE videoLoop(void);
extern void videoLoop(void);
extern void loop_SetVideoPlaybackMode(void);
extern void loop_ClearVideoPlaybackMode(void);
extern BOOL loop_GetVideoStatus(void);

34
src/main.c
View File

@ -111,14 +111,14 @@ extern void debug_callback_stderr( void**, const char * );
extern void debug_callback_win32debug( void**, const char * );
void setFramerateLimit(Uint32 fpsLimit)
void setFramerateLimit(int fpsLimit)
{
SDL_initFramerate( &wzFPSmanager );
SDL_setFramerate( &wzFPSmanager, fpsLimit );
}
Uint32 getFramerateLimit(void)
int getFramerateLimit(void)
{
return SDL_getFramerate( &wzFPSmanager );
}
@ -655,21 +655,17 @@ static void mainLoop(void)
{
switch (event.type)
{
// This is uneccessary if we don't have the focus (either we don't get any events or they can't be dealt with anyway)
if (focusState == FOCUS_IN)
{
case SDL_KEYUP:
case SDL_KEYDOWN:
inputHandleKeyEvent(&event);
break;
case SDL_MOUSEBUTTONUP:
case SDL_MOUSEBUTTONDOWN:
inputHandleMouseButtonEvent(&event);
break;
case SDL_MOUSEMOTION:
inputHandleMouseMotionEvent(&event);
break;
}
case SDL_KEYUP:
case SDL_KEYDOWN:
inputHandleKeyEvent(&event);
break;
case SDL_MOUSEBUTTONUP:
case SDL_MOUSEBUTTONDOWN:
inputHandleMouseButtonEvent(&event);
break;
case SDL_MOUSEMOTION:
inputHandleMouseMotionEvent(&event);
break;
case SDL_ACTIVEEVENT:
handleActiveEvent(&event);
break;
@ -683,7 +679,9 @@ static void mainLoop(void)
if (focusState == FOCUS_IN)
{
if (loop_GetVideoStatus())
{
videoLoop(); // Display the video if neccessary
}
else switch (GetGameMode())
{
case GS_NORMAL: // Run the gameloop code
@ -805,13 +803,11 @@ int main(int argc, char *argv[])
if (psPaletteBuffer == NULL)
{
debug( LOG_ERROR, "Out of memory" );
abort();
return -1;
}
if ( !loadFileToBuffer("palette.bin", (char*)psPaletteBuffer, ( 256 * sizeof(iColour) + 1 ), &pSize) )
{
debug( LOG_ERROR, "Couldn't load palette data" );
abort();
return -1;
}
pal_AddNewPalette(psPaletteBuffer);