Browse Source

Fix some warnings.

pull/1/head
Night Owl 7 years ago
parent
commit
b2558c749d
  1. 12
      dlls/bot/bot.cpp
  2. 4
      dlls/bot/bot.h
  3. 8
      dlls/client.cpp
  4. 6
      engine/eiface.h

12
dlls/bot/bot.cpp

@ -64,12 +64,12 @@ BOOL skin_used[MAX_SKINS] = {
FALSE, FALSE, FALSE, FALSE, FALSE}; FALSE, FALSE, FALSE, FALSE, FALSE};
// store the names of the models... // store the names of the models...
char *bot_skins[MAX_SKINS] = { const char *bot_skins[MAX_SKINS] = {
"barney", "gina", "gman", "gordon", "helmet", "barney", "gina", "gman", "gordon", "helmet",
"hgrunt", "recon", "robo", "scientist", "zombie"}; "hgrunt", "recon", "robo", "scientist", "zombie"};
// store the player names for each of the models... // store the player names for each of the models...
char *bot_names[MAX_SKINS] = { const char *bot_names[MAX_SKINS] = {
"Barney", "Gina", "G-Man", "Gordon", "Helmet", "Barney", "Gina", "G-Man", "Gordon", "Helmet",
"H-Grunt", "Recon", "Robo", "Scientist", "Zombie"}; "H-Grunt", "Recon", "Robo", "Scientist", "Zombie"};
@ -101,13 +101,13 @@ inline char *GET_INFOBUFFER( edict_t *e )
return (*g_engfuncs.pfnGetInfoKeyBuffer)( e ); return (*g_engfuncs.pfnGetInfoKeyBuffer)( e );
} }
inline char *GET_INFO_KEY_VALUE( char *infobuffer, char *key ) inline char *GET_INFO_KEY_VALUE( const char *infobuffer, const char *key )
{ {
return (g_engfuncs.pfnInfoKeyValue( infobuffer, key )); return (g_engfuncs.pfnInfoKeyValue( infobuffer, key ));
} }
inline void SET_CLIENT_KEY_VALUE( int clientIndex, char *infobuffer, inline void SET_CLIENT_KEY_VALUE( int clientIndex, const char *infobuffer,
char *key, char *value ) const char *key, const char *value )
{ {
(*g_engfuncs.pfnSetClientKeyValue)( clientIndex, infobuffer, key, value ); (*g_engfuncs.pfnSetClientKeyValue)( clientIndex, infobuffer, key, value );
} }
@ -221,7 +221,7 @@ void BotCreate(const char *skin, const char *name, const char *skill)
sprintf( err_msg, "model \"%s\" is unknown.\n", c_skin ); sprintf( err_msg, "model \"%s\" is unknown.\n", c_skin );
UTIL_ClientPrintAll( HUD_PRINTNOTIFY, err_msg ); UTIL_ClientPrintAll( HUD_PRINTNOTIFY, err_msg );
if (IS_DEDICATED_SERVER()) if (IS_DEDICATED_SERVER())
printf(err_msg); printf( "%s\n", err_msg );
UTIL_ClientPrintAll( HUD_PRINTNOTIFY, UTIL_ClientPrintAll( HUD_PRINTNOTIFY,
"use barney, gina, gman, gordon, helmet, hgrunt,\n"); "use barney, gina, gman, gordon, helmet, hgrunt,\n");

4
dlls/bot/bot.h

@ -26,8 +26,8 @@
typedef struct // used in checking if bot can pick up ammo typedef struct // used in checking if bot can pick up ammo
{ {
char *ammo_name; const char *ammo_name;
char *weapon_name; const char *weapon_name;
int max_carry; int max_carry;
} ammo_check_t; } ammo_check_t;

8
dlls/client.cpp

@ -1205,7 +1205,7 @@ void StartFrame( void )
if( IS_DEDICATED_SERVER() ) if( IS_DEDICATED_SERVER() )
{ {
sprintf( msg, "min_bots set to %d\n", min_bots ); sprintf( msg, "min_bots set to %d\n", min_bots );
printf( msg ); printf( "%s\n", msg );
} }
} }
else if( strcmp( cmd, "max_bots" ) == 0 ) else if( strcmp( cmd, "max_bots" ) == 0 )
@ -1218,7 +1218,7 @@ void StartFrame( void )
if( IS_DEDICATED_SERVER() ) if( IS_DEDICATED_SERVER() )
{ {
sprintf( msg, "max_bots set to %d\n", max_bots ); sprintf( msg, "max_bots set to %d\n", max_bots );
printf( msg ); printf( "%s\n", msg );
} }
} }
else if( strcmp( cmd, "pause" ) == 0 ) else if( strcmp( cmd, "pause" ) == 0 )
@ -1232,7 +1232,7 @@ void StartFrame( void )
ALERT( at_console, msg ); ALERT( at_console, msg );
if( IS_DEDICATED_SERVER() ) if( IS_DEDICATED_SERVER() )
printf( msg ); printf( "%s\n", msg );
SERVER_COMMAND( server_cmd ); SERVER_COMMAND( server_cmd );
} }
@ -1250,7 +1250,7 @@ void StartFrame( void )
{ {
check_server_cmd = gpGlobals->time + 1.0; check_server_cmd = gpGlobals->time + 1.0;
char *cvar_bot = (char *)CVAR_GET_STRING( "bot" ); const char *cvar_bot = CVAR_GET_STRING( "bot" );
if( cvar_bot && cvar_bot[0] ) if( cvar_bot && cvar_bot[0] )
{ {

6
engine/eiface.h

@ -201,9 +201,9 @@ typedef struct enginefuncs_s
void (*pfnRunPlayerMove)( edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec ); void (*pfnRunPlayerMove)( edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec );
int (*pfnNumberOfEntities)( void ); int (*pfnNumberOfEntities)( void );
char* (*pfnGetInfoKeyBuffer)( edict_t *e ); // passing in NULL gets the serverinfo char* (*pfnGetInfoKeyBuffer)( edict_t *e ); // passing in NULL gets the serverinfo
char* (*pfnInfoKeyValue)( char *infobuffer, const char *key ); char* (*pfnInfoKeyValue)( const char *infobuffer, const char *key );
void (*pfnSetKeyValue)( char *infobuffer, const char *key, const char *value ); void (*pfnSetKeyValue)( const char *infobuffer, const char *key, const char *value );
void (*pfnSetClientKeyValue)( int clientIndex, char *infobuffer, const char *key, const char *value ); void (*pfnSetClientKeyValue)( int clientIndex, const char *infobuffer, const char *key, const char *value );
int (*pfnIsMapValid)( const char *filename ); int (*pfnIsMapValid)( const char *filename );
void (*pfnStaticDecal)( const float *origin, int decalIndex, int entityIndex, int modelIndex ); void (*pfnStaticDecal)( const float *origin, int decalIndex, int entityIndex, int modelIndex );
int (*pfnPrecacheGeneric)( const char *s ); int (*pfnPrecacheGeneric)( const char *s );

Loading…
Cancel
Save