ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-13 00:24:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed more warnings

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-05-21 21:39:14 +02:00
parent 722ababa8b
commit f197b409ad
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/game/g_main.c
View file

@ -1952,7 +1952,7 @@ void G_ShutdownGame( int restart ) {
#if 0 // kef -- Pat sez this is causing some trouble these days #if 0 // kef -- Pat sez this is causing some trouble these days
G_LogWeaponOutput(); G_LogWeaponOutput();
#endif #endif
if ( level.logFile ) { if ( level.logFile != 0) {
G_LogPrintf("ShutdownGame:\n" ); G_LogPrintf("ShutdownGame:\n" );
G_LogPrintf("------------------------------------------------------------\n" ); G_LogPrintf("------------------------------------------------------------\n" );
trap_FS_FCloseFile( level.logFile ); trap_FS_FCloseFile( level.logFile );
@ -1961,7 +1961,7 @@ void G_ShutdownGame( int restart ) {
// write all the client session data so we can get it back // write all the client session data so we can get it back
G_WriteSessionData(); G_WriteSessionData();
if ( trap_Cvar_VariableIntegerValue( "bot_enable" ) ) { if ( trap_Cvar_VariableIntegerValue( "bot_enable" ) != 0 ) {
BotAIShutdown( restart ); BotAIShutdown( restart );
} }
@ -1987,8 +1987,10 @@ void QDECL Com_Error ( int errlevel, const char *error, ... ) {
va_list argptr; va_list argptr;
char text[1024]; char text[1024];
UNUSED(errlevel);
va_start (argptr, error); va_start (argptr, error);
vsprintf (text, error, argptr); vsnprintf(text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
G_Error( "%s", text); G_Error( "%s", text);
@ -1999,7 +2001,7 @@ void QDECL Com_Printf( const char *msg, ... ) {
char text[1024]; char text[1024];
va_start (argptr, msg); va_start (argptr, msg);
vsprintf (text, msg, argptr); vsnprintf(text, sizeof(text), msg, argptr);
va_end (argptr); va_end (argptr);
G_Printf ("%s", text); G_Printf ("%s", text);
@ -2179,7 +2181,7 @@ void G_Client_CalculateRanks( qboolean fromExit ) {
} }
} }
qsort( level.sortedClients, level.numConnectedClients, qsort( level.sortedClients, (size_t)level.numConnectedClients,
sizeof(level.sortedClients[0]), SortRanks ); sizeof(level.sortedClients[0]), SortRanks );
// set the rank value for all clients that are connected and not spectators // set the rank value for all clients that are connected and not spectators
@ -2241,7 +2243,7 @@ void G_Client_CalculateRanks( qboolean fromExit ) {
} }
// if we are at the intermission, send the new info to everyone // if we are at the intermission, send the new info to everyone
if ( level.intermissiontime ) { if ( level.intermissiontime != 0 ) {
SendScoreboardMessageToAllClients(); SendScoreboardMessageToAllClients();
} }
} }
@ -2607,7 +2609,7 @@ Advances the non-player objects in the world
void CheckHealthInfoMessage( void ); void CheckHealthInfoMessage( void );
void G_RunFrame( int levelTime ) { void G_RunFrame( int levelTime ) {
int i; int i;
/*@dependent@*/ gentity_t *ent; gentity_t *ent;
gclient_t *client; gclient_t *client;
playerState_t *ps; playerState_t *ps;
entityState_t *es; entityState_t *es;
@ -2638,7 +2640,7 @@ void G_RunFrame( int levelTime ) {
// clear events that are too old // clear events that are too old
if ( level.time - ent->eventTime > EVENT_VALID_MSEC ) { if ( level.time - ent->eventTime > EVENT_VALID_MSEC ) {
if ( es->event ) { if ( es->event != 0 ) {
es->event = 0; es->event = 0;
if ( ent->client ) { if ( ent->client ) {
ps->externalEvent = 0; ps->externalEvent = 0;
@ -2670,7 +2672,7 @@ void G_RunFrame( int levelTime ) {
if ( !ent->client ) if ( !ent->client )
{ {
if ( es->eFlags & EF_ANIM_ONCE ) if ( (es->eFlags & EF_ANIM_ONCE) == EF_ANIM_ONCE )
{//this must be capped render-side {//this must be capped render-side
es->frame++; es->frame++;
} }

2
code/game/q_shared.c
View file

@ -976,7 +976,7 @@ varargs versions of all text functions.
FIXME: make this buffer size safe someday FIXME: make this buffer size safe someday
============ ============
*/ */
/*@shared@*/ char * QDECL va( char *format, ... ) { char * QDECL va( char *format, ... ) {
va_list argptr; va_list argptr;
static char string[2][32000]; /* in case va is called by nested functions */ static char string[2][32000]; /* in case va is called by nested functions */
static int index = 0; static int index = 0;

6
code/game/q_shared.h
View file

@ -213,6 +213,10 @@ void Sys_PumpEvents( void );
#endif #endif
#if !defined(UNUSED)
#define UNUSED(x) ((void)(x))
#endif
#define SOUND_DIR "sound/weapons/" #define SOUND_DIR "sound/weapons/"
//============================================================= //=============================================================
@ -749,7 +753,7 @@ float LittleFloat (float l);
void Swap_Init (void); void Swap_Init (void);
char * QDECL va(char *format, ...) __attribute__ ((format (printf, 1, 2))); /*@shared@*/ char * QDECL va(char *format, ...) __attribute__ ((format (printf, 1, 2)));
//============================================= //=============================================