This commit is contained in:
mv 2024-08-30 03:09:22 +03:00
parent 8419a607ef
commit 0aba158320
19 changed files with 29 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -56,7 +56,7 @@ void C_ASW_Medal_Store::LoadMedalStore()
return;
char szMedalFile[ 256 ];
Q_snprintf( szMedalFile, sizeof( szMedalFile ), "cfg/clientc_%s.dat", pSteamUser->GetSteamID().Render() );
Q_snprintf( szMedalFile, sizeof( szMedalFile ), "cfg/clientc_%I64u.dat", pSteamUser->GetSteamID().ConvertToUint64() );
int len = Q_strlen( szMedalFile );
for ( int i = 0; i < len; i++ )
{
@ -322,7 +322,7 @@ bool C_ASW_Medal_Store::SaveMedalStore()
return false;
char szMedalFile[ 256 ];
Q_snprintf( szMedalFile, sizeof( szMedalFile ), "cfg/clientc_%s.dat", pSteamUser->GetSteamID().Render() );
Q_snprintf( szMedalFile, sizeof( szMedalFile ), "cfg/clientc_%I64u.dat", pSteamUser->GetSteamID().ConvertToUint64() );
int len = Q_strlen( szMedalFile );
for ( int i = 0; i < len; i++ )
{

View File

@ -115,7 +115,7 @@ void CASW_Weapon_Jump_Jet::PrimaryAttack( void )
void CASW_Weapon_Jump_Jet::DoJumpJet()
{
CASW_Marine *pMarine = GetMarine();
if ( !pMarine )
if ( !pMarine || pMarine->m_iJumpJetting != JJ_NONE )
return;
pMarine->m_iJumpJetting = JJ_JUMP_JETS;

Binary file not shown.

View File

@ -1532,9 +1532,32 @@ void FileSystem_AddSearchPath_Platform( IFileSystem *pFileSystem, const char *sz
}
else
{
Q_strncpy( platform, szGameInfoPath, MAX_PATH );
Q_StripTrailingSlash( platform );
Q_strncat( platform, "/../platform", MAX_PATH, MAX_PATH );
if ( !Sys_GetExecutableName( platform, sizeof( platform ) ) )
{
// fall back to old method if we can't get the executable name
Q_strncpy( platform, szGameInfoPath, MAX_PATH );
Q_StripTrailingSlash( platform );
Q_strncat( platform, "/../platform", MAX_PATH, MAX_PATH );
}
else
{
Q_StripFilename( platform );
Q_StripTrailingSlash( platform );
Q_FixSlashes( platform );
// remove bin folder if necessary
int nLen = Q_strlen( platform );
if ( ( nLen > 4 )
&& platform[ nLen - 4 ] == CORRECT_PATH_SEPARATOR
&& !Q_stricmp( "bin", platform + ( nLen - 3 ) )
)
{
Q_StripLastDir( platform, sizeof( platform ) );
Q_StripTrailingSlash( platform );
}
// go into platform folder
Q_strncat( platform, "/platform", MAX_PATH, MAX_PATH );
}
}
pFileSystem->AddSearchPath( platform, "PLATFORM" );