Skip to content

Commit

Permalink
engine: replace few more Xash3D strings by XASH_ENGINE_NAME macro
Browse files Browse the repository at this point in the history
  • Loading branch information
a1batross committed Jan 23, 2025
1 parent ef75a4c commit c86c455
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion engine/common/filesystem_engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static qboolean FS_DetermineRootDirectory( char *out, size_t size )
#elif XASH_PSVITA
if( PSVita_GetBasePath( out, size ))
return true;
Sys_Error( "couldn't find Xash3D data directory" );
Sys_Error( "couldn't find %s data directory", XASH_ENGINE_NAME );
return false;
#elif ( XASH_SDL == 2 ) && !XASH_NSWITCH // GetBasePath not impl'd in switch-sdl2
#if XASH_APPLE
Expand Down
4 changes: 2 additions & 2 deletions engine/common/identification.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ void ID_Init( void )
#elif XASH_WIN32
{
CHAR szBuf[MAX_PATH];
ID_GetKeyData( HKEY_CURRENT_USER, "Software\\Xash3D\\", "xash_id", szBuf, MAX_PATH );
ID_GetKeyData( HKEY_CURRENT_USER, "Software\\"XASH_ENGINE_NAME"\\", "xash_id", szBuf, MAX_PATH );

sscanf(szBuf, "%016"PRIX64, &id);
id ^= SYSTEM_XOR_MASK;
Expand Down Expand Up @@ -686,7 +686,7 @@ void ID_Init( void )
{
CHAR Buf[MAX_PATH];
sprintf( Buf, "%016"PRIX64, id^SYSTEM_XOR_MASK );
ID_SetKeyData( HKEY_CURRENT_USER, "Software\\Xash3D\\", REG_SZ, "xash_id", Buf, Q_strlen(Buf) );
ID_SetKeyData( HKEY_CURRENT_USER, "Software\\"XASH_ENGINE_NAME"\\", REG_SZ, "xash_id", Buf, Q_strlen(Buf) );
}
#else
{
Expand Down
2 changes: 1 addition & 1 deletion engine/server/sv_save.c
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,7 @@ int GAME_EXPORT SV_GetSaveComment( const char *savename, char *comment )

if( tag == 0x0065 )
{
Q_strncpy( comment, "<old version Xash3D unsupported>", MAX_STRING );
Q_strncpy( comment, "<old version "XASH_ENGINE_NAME" unsupported>", MAX_STRING );
FS_Close( f );
return 0;
}
Expand Down

0 comments on commit c86c455

Please sign in to comment.