diff options
| author | M. Kristall <mkpdev@gmail.com> | 2009-10-03 11:37:03 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:10 +0000 |
| commit | bcc79996c4c254a528e7b00f260d8ebd09e2a820 (patch) | |
| tree | 12a47818547b4cd85cc2465393e0bccdf4868057 /src/game | |
| parent | 6f74ece9e3d772e8934e6e8f24defbd5238cbeed (diff) | |
* (bug 3554) Fix a few more places where opened files might not be closed
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_client.c | 2 | ||||
| -rw-r--r-- | src/game/g_maprotation.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c index 3022a9cc..d0f9349f 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -887,7 +887,7 @@ static qboolean G_NonSegModel( const char *filename ) return qfalse; } - if( len <= 0 ) + if( len < 0 ) return qfalse; if( len >= sizeof( text ) - 1 ) diff --git a/src/game/g_maprotation.c b/src/game/g_maprotation.c index b97b3b6f..b34370b8 100644 --- a/src/game/g_maprotation.c +++ b/src/game/g_maprotation.c @@ -310,7 +310,7 @@ static qboolean G_ParseMapRotationFile( const char *fileName ) // load the file len = trap_FS_FOpenFile( fileName, &f, FS_READ ); - if( len <= 0 ) + if( len < 0 ) return qfalse; if( len >= sizeof( text ) - 1 ) @@ -773,13 +773,10 @@ Load and intialise the map rotations void G_InitMapRotations( void ) { const char *fileName = "maprotation.cfg"; - fileHandle_t f; //load the file if it exists - if( trap_FS_FOpenFile( fileName, &f, FS_READ ) > 0 ) + if( trap_FS_FOpenFile( fileName, NULL, FS_READ ) ) { - trap_FS_FCloseFile( f ); - if( !G_ParseMapRotationFile( fileName ) ) G_Printf( S_COLOR_RED "ERROR: failed to parse %s file\n", fileName ); } |