* Merged in a bunch of game side fixed from ioq3

6 files changed, 13 insertions, 17 deletions

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 39b6d959..348bb433 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -296,7 +296,7 @@ CG_InitBuildables
 Initialises the animation db
 ===============
 */
-void CG_InitBuildables( )
+void CG_InitBuildables( void )
 {
   char          filename[ MAX_QPATH ];
   char          soundfile[ MAX_QPATH ];
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 38af5c76..d7c07036 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -514,7 +514,7 @@ static void CG_DrawProgressBar( rectDef_t *rect, vec4_t color, float scale,
 
 //=============== TA: was cg_newdraw.c
 
-void CG_InitTeamChat( )
+void CG_InitTeamChat( void )
 {
   memset( teamChat1,  0, sizeof( teamChat1 ) );
   memset( teamChat2,  0, sizeof( teamChat2 ) );
@@ -3016,7 +3016,7 @@ static void CG_DrawTeamVote( void )
 }
 
 
-static qboolean CG_DrawScoreboard( )
+static qboolean CG_DrawScoreboard( void )
 {
   static qboolean firstTime = qtrue;
   float fade, *fadeColor;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 7ee70554..88df61ba 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1510,7 +1510,7 @@ void        CG_KeyEvent( int key, qboolean down );
 void        CG_MouseEvent( int x, int y );
 void        CG_EventHandling( int type );
 void        CG_SetScoreSelection( void *menu );
-void        CG_BuildSpectatorString( );
+void        CG_BuildSpectatorString( void );
 
 qboolean    CG_FileExists( char *filename );
 void        CG_RemoveConsoleLine( void );
@@ -1576,7 +1576,7 @@ int         CG_Text_Height( const char *text, float scale, int limit );
 float       CG_GetValue(int ownerDraw);
 void        CG_RunMenuScript(char **args);
 void        CG_SetPrintString( int type, const char *p );
-void        CG_InitTeamChat( );
+void        CG_InitTeamChat( void );
 void        CG_GetTeamColor( vec4_t *color );
 const char  *CG_GetKillerText();
 void        CG_Text_PaintChar( float x, float y, float width, float height, float scale,
@@ -1603,7 +1603,7 @@ void        CG_Bleed( vec3_t origin, vec3_t normal, int entityNum );
 //
 void        CG_GhostBuildable( buildable_t buildable );
 void        CG_Buildable( centity_t *cent );
-void        CG_InitBuildables( );
+void        CG_InitBuildables( void );
 void        CG_HumanBuildableExplosion( vec3_t origin, vec3_t dir );
 void        CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir );
 
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 767aabef..81470e0e 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -34,9 +34,9 @@ This is the only way control passes into the module.
 This must be the very first function compiled into the .q3vm file
 ================
 */
-int vmMain( int command, int arg0, int arg1, int arg2, int arg3,
-                         int arg4, int arg5, int arg6, int arg7,
-                         int arg8, int arg9, int arg10, int arg11 )
+long vmMain( long command, long arg0, long arg1, long arg2, long arg3,
+                           long arg4, long arg5, long arg6, long arg7,
+                           long arg8, long arg9, long arg10, long arg11 )
 {
   switch( command )
   {
@@ -524,9 +524,6 @@ void QDECL CG_Error( const char *msg, ... )
   trap_Error( text );
 }
 
-#ifndef CGAME_HARD_LINKED
-// this is only here so the functions in q_shared.c and bg_*.c can link (FIXME)
-
 void QDECL Com_Error( int level, const char *error, ... )
 {
   va_list argptr;
@@ -562,8 +559,6 @@ void QDECL Com_Printf( const char *msg, ... ) {
   CG_Printf ("%s", text);
 }
 
-#endif
-
 
 
 /*
@@ -1591,7 +1586,7 @@ static qboolean CG_OwnerDrawVisible( int parameter )
 CG_LoadHudMenu
 =================
 */
-void CG_LoadHudMenu( )
+void CG_LoadHudMenu( void )
 {
   char        buff[ 1024 ];
   const char  *hudSet;
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index fd186145..ac1ec181 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -104,6 +104,7 @@ static qboolean CG_ParseAnimationFile( const char *filename, clientInfo_t *ci )
   if( len >= sizeof( text ) - 1 )
   {
     CG_Printf( "File %s too long\n", filename );
+    trap_FS_FCloseFile( f );
     return qfalse;
   }
 
diff --git a/src/cgame/cg_syscalls.c b/src/cgame/cg_syscalls.c
index f556035d..3e8c5849 100644
--- a/src/cgame/cg_syscalls.c
+++ b/src/cgame/cg_syscalls.c
@@ -18,10 +18,10 @@
 
 #include "cg_local.h"
 
-static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1;
+static long (QDECL *syscall)( long arg, ... ) = (long (QDECL *)( long, ...))-1;
 
 
-void dllEntry( int (QDECL  *syscallptr)( int arg,... ) )
+void dllEntry( long (QDECL  *syscallptr)( long arg,... ) )
 {
   syscall = syscallptr;
 }