vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: server: replace useless call to SV_Serverinfo to a direct access

Browse source
This commit is contained in:
Alibek Omarov 2024-04-06 06:51:02 +03:00
parent 2ec0d25d85
commit f60e856f35
5 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/common/cvar.c
View file

@ -152,8 +152,10 @@ static qboolean Cvar_UpdateInfo( convar_t *var, const char *value, qboolean noti
if ( Host_IsDedicated() ) if ( Host_IsDedicated() )
{ {
// g-cont. this is a very strange behavior... // g-cont. this is a very strange behavior...
Info_SetValueForKey( SV_Serverinfo(), var->name, value, MAX_SERVERINFO_STRING ), char *info = SV_Serverinfo();
SV_BroadcastCommand( "fullserverinfo \"%s\"\n", SV_Serverinfo( ));
Info_SetValueForKey( info, var->name, value, MAX_SERVERINFO_STRING ),
SV_BroadcastCommand( "fullserverinfo \"%s\"\n", info );
} }
#if !XASH_DEDICATED #if !XASH_DEDICATED
else else

2
engine/server/sv_client.c
View file

@ -1690,7 +1690,7 @@ static qboolean SV_New_f( sv_client_t *cl )
// server info string // server info string
MSG_BeginServerCmd( &msg, svc_stufftext ); MSG_BeginServerCmd( &msg, svc_stufftext );
MSG_WriteStringf( &msg, "fullserverinfo \"%s\"\n", SV_Serverinfo( )); MSG_WriteStringf( &msg, "fullserverinfo \"%s\"\n", svs.serverinfo );
// collect the info about all the players and send to me // collect the info about all the players and send to me
for( i = 0, cur = svs.clients; i < svs.maxclients; i++, cur++ ) for( i = 0, cur = svs.clients; i < svs.maxclients; i++, cur++ )

2
engine/server/sv_cmds.c
View file

@ -753,7 +753,7 @@ static void SV_ServerInfo_f( void )
} }
Info_SetValueForStarKey( svs.serverinfo, Cmd_Argv( 1 ), Cmd_Argv( 2 ), MAX_SERVERINFO_STRING ); Info_SetValueForStarKey( svs.serverinfo, Cmd_Argv( 1 ), Cmd_Argv( 2 ), MAX_SERVERINFO_STRING );
SV_BroadcastCommand( "fullserverinfo \"%s\"\n", SV_Serverinfo( )); SV_BroadcastCommand( "fullserverinfo \"%s\"\n", svs.serverinfo );
} }
/* /*

16
engine/server/sv_game.c
View file

@ -143,18 +143,6 @@ char *SV_Serverinfo( void )
return svs.serverinfo; return svs.serverinfo;
} }
/*
=============
SV_LocalInfo
get local infostring
=============
*/
static char *SV_Localinfo( void )
{
return svs.localinfo;
}
/* /*
============= =============
SV_AngleMod SV_AngleMod
@ -3838,11 +3826,11 @@ static char *GAME_EXPORT pfnGetInfoKeyBuffer( edict_t *e )
// NULL passes localinfo // NULL passes localinfo
if( !SV_IsValidEdict( e )) if( !SV_IsValidEdict( e ))
return SV_Localinfo(); return svs.localinfo;
// world passes serverinfo // world passes serverinfo
if( e == svgame.edicts ) if( e == svgame.edicts )
return SV_Serverinfo(); return svs.serverinfo;
// userinfo for specified edict // userinfo for specified edict
if(( cl = SV_ClientFromEdict( e, false )) != NULL ) if(( cl = SV_ClientFromEdict( e, false )) != NULL )

2
engine/server/sv_log.c
View file

@ -77,7 +77,7 @@ void Log_Open( void )
if( fp ) svs.log.file = fp; if( fp ) svs.log.file = fp;
Log_Printf( "Log file started (file \"%s\") (game \"%s\") (version \"%i/" XASH_VERSION "/%d\")\n", Log_Printf( "Log file started (file \"%s\") (game \"%s\") (version \"%i/" XASH_VERSION "/%d\")\n",
szTestFile, Info_ValueForKey( SV_Serverinfo(), "*gamedir" ), PROTOCOL_VERSION, Q_buildnum() ); szTestFile, Info_ValueForKey( svs.serverinfo, "*gamedir" ), PROTOCOL_VERSION, Q_buildnum() );
} }
void Log_Close( void ) void Log_Close( void )