YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-30 08:44:31 +00:00
Code Issues Projects Releases Wiki Activity

engine: server: simplify strings operations.

Browse Source
This commit is contained in:
Andrey Akhmichin 2022-12-19 23:56:03 +05:00 committed by Alibek Omarov
parent 18e68f1ab3
commit 9450c08eec
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/server/sv_client.c
View File

@ -930,15 +930,26 @@ void SV_BuildNetAnswer( netadr_t from )
} }
else if( type == NETAPI_REQUEST_PLAYERS ) else if( type == NETAPI_REQUEST_PLAYERS )
{ {
size_t len = 0;
string[0] = '\0'; string[0] = '\0';
for( i = 0; i < svs.maxclients; i++ ) for( i = 0; i < svs.maxclients; i++ )
{ {
if( svs.clients[i].state >= cs_connected ) if( svs.clients[i].state >= cs_connected )
{ {
int ret;
edict_t *ed = svs.clients[i].edict; edict_t *ed = svs.clients[i].edict;
float time = host.realtime - svs.clients[i].connection_started; float time = host.realtime - svs.clients[i].connection_started;
Q_strncat( string, va( "%c\\%s\\%i\\%f\\", count, svs.clients[i].name, (int)ed->v.frags, time ), sizeof( string )); ret = Q_snprintf( &string[len], sizeof( string ) - len, "%c\\%s\\%i\\%f\\", count, svs.clients[i].name, (int)ed->v.frags, time );
if( ret == -1 )
{
Con_DPrintf( S_WARN "SV_BuildNetAnswer: NETAPI_REQUEST_PLAYERS: buffer overflow!\n" );
break;
}
len += ret;
count++; count++;
} }
} }

10
engine/server/sv_save.c
View File

@ -2418,13 +2418,13 @@ int GAME_EXPORT SV_GetSaveComment( const char *savename, char *comment )
if( FBitSet( flags, MAP_INVALID_VERSION )) if( FBitSet( flags, MAP_INVALID_VERSION ))
{ {
Q_strncpy( comment, va( "<map %s has invalid format>", mapName ), MAX_STRING ); Q_snprintf( comment, sizeof( comment ), "<map %s has invalid format>", mapName );
return 0; return 0;
} }
if( !FBitSet( flags, MAP_IS_EXIST )) if( !FBitSet( flags, MAP_IS_EXIST ))
{ {
Q_strncpy( comment, va( "<map %s is missed>", mapName ), MAX_STRING ); Q_snprintf( comment, sizeof( comment ), "<map %s is missed>", mapName );
return 0; return 0;
} }
@ -2433,10 +2433,10 @@ int GAME_EXPORT SV_GetSaveComment( const char *savename, char *comment )
// split comment to sections // split comment to sections
if( Q_strstr( savename, "quick" )) if( Q_strstr( savename, "quick" ))
Q_strncat( comment, "[quick]", CS_SIZE ); Q_snprintf( comment, sizeof( comment ), "[quick]%s", description );
else if( Q_strstr( savename, "autosave" )) else if( Q_strstr( savename, "autosave" ))
Q_strncat( comment, "[autosave]", CS_SIZE ); Q_snprintf( comment, sizeof( comment ), "[autosave]%s", description );
Q_strncat( comment, description, CS_SIZE ); else Q_strncpy( comment, description, sizeof( comment ));
strftime( timestring, sizeof ( timestring ), "%b%d %Y", file_tm ); strftime( timestring, sizeof ( timestring ), "%b%d %Y", file_tm );
Q_strncpy( comment + CS_SIZE, timestring, CS_TIME ); Q_strncpy( comment + CS_SIZE, timestring, CS_TIME );
strftime( timestring, sizeof( timestring ), "%H:%M", file_tm ); strftime( timestring, sizeof( timestring ), "%H:%M", file_tm );