diff options
| -rw-r--r-- | src/cgame/cg_buildable.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_view.c | 4 | ||||
| -rw-r--r-- | src/client/cl_main.c | 2 | ||||
| -rw-r--r-- | src/qcommon/common.c | 4 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | src/tools/lcc/lburg/gram.y | 1 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 2 |
8 files changed, 8 insertions, 11 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c index 89d23eca..5aae1d20 100644 --- a/src/cgame/cg_buildable.c +++ b/src/cgame/cg_buildable.c @@ -122,7 +122,7 @@ static void CG_Creep( centity_t *cent ) else frac = 1.0f; } - else if( time < 0 ) + else { msec = cg.time + time; if( msec >= 0 && msec < CREEP_SCALEDOWN_TIME ) diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index e955e8ab..ae4a2619 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -1068,7 +1068,7 @@ static void CG_ParseVoice( void ) return; vChan = atoi( CG_Argv( 2 ) ); - if( vChan < 0 || vChan >= VOICE_CHAN_NUM_CHANS ) + if( (int)vChan < 0 || vChan >= VOICE_CHAN_NUM_CHANS ) return; if( cg_teamChatsOnly.integer && vChan != VOICE_CHAN_TEAM ) diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index 253bc105..f7f42474 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -925,9 +925,7 @@ static int CG_CalcFov( void ) { f = ( cg.time - cg.zoomTime ) / (float)ZOOM_TIME; - if ( f > 1.0f ) - fov_y = fov_y; - else + if ( f <= 1.0f ) fov_y = zoomFov + f * ( fov_y - zoomFov ); // BUTTON_ATTACK2 is held so zoom next time diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 2ae95fa3..5e8aa4b5 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -1758,7 +1758,7 @@ static void CL_CompletePlayerName( char *args, int argNum ) } qsort( (void*)namesPtr, nameCount, sizeof( namesPtr[0] ), Com_strCompare ); - Field_CompletePlayerName( namesPtr, nameCount ); + Field_CompletePlayerName( (const char *const *)namesPtr, nameCount ); } } diff --git a/src/qcommon/common.c b/src/qcommon/common.c index 11e723c1..80a8df7b 100644 --- a/src/qcommon/common.c +++ b/src/qcommon/common.c @@ -3451,7 +3451,7 @@ static qboolean Field_CompletePlayerNameFinal( qboolean whitespace ) return qfalse; } -static void Name_PlayerNameCompletion( const char **names, int nameCount, void(*callback)(const char *s) ) +static void Name_PlayerNameCompletion( const char *const *names, int nameCount, void(*callback)(const char *s) ) { int i; @@ -3535,7 +3535,7 @@ qboolean Com_PlayerNameToFieldString( char *str, int length, const char *name ) return qtrue; } -void Field_CompletePlayerName( char **names, int nameCount ) +void Field_CompletePlayerName( const char *const *names, int nameCount ) { qboolean whitespace; diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index ef8fcbd5..0413a36c 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -742,7 +742,7 @@ void Field_CompleteFilename( const char *dir, const char *ext, qboolean stripExt, qboolean allowNonPureFilesOnDisk ); void Field_CompleteCommand( char *cmd, qboolean doCommands, qboolean doCvars ); -void Field_CompletePlayerName( char **names, int count ); +void Field_CompletePlayerName( const char *const *names, int count ); /* ============================================================== diff --git a/src/tools/lcc/lburg/gram.y b/src/tools/lcc/lburg/gram.y index c0a9c942..1c343c79 100644 --- a/src/tools/lcc/lburg/gram.y +++ b/src/tools/lcc/lburg/gram.y @@ -1,7 +1,6 @@ %{ #include <stdio.h> #include "lburg.h" -static char rcsid[] = "$Id: gram.y 145 2001-10-17 21:53:10Z timo $"; /*lint -e616 -e527 -e652 -esym(552,yynerrs) -esym(563,yynewstate,yyerrlab) */ static int yylineno = 0; %} diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 74a937a8..95aed52b 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -866,7 +866,7 @@ static void UI_BuildServerStatus( qboolean force ) UI_BuildServerDisplayList ================== */ -static void UI_BuildServerDisplayList( qboolean force ) +static void UI_BuildServerDisplayList( int force ) { int i, count, clients, maxClients, ping, len, visible; char info[MAX_STRING_CHARS]; |