H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-07 17:29:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

game: fix compilation problems for clang

Browse Source
This commit is contained in:
nillerusr
2022-06-20 14:17:53 +03:00
parent ff99055be1
commit ddafaa790e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/shared/hl2/survival_gamerules.cpp
+2 -2
View File
@@ -207,7 +207,7 @@ void CHalfLife2Survival::ParseSurvivalSettings( KeyValues *pSubKey )
}
else if ( !stricmp( pTestKey->GetName(), "spawnhealth" ) )
{
m_SurvivalSettings.m_iSpawnHealth = pTestKey->GetInt( NULL, 100 );
m_SurvivalSettings.m_iSpawnHealth = pTestKey->GetInt( 0, 100 );
}
else if ( !stricmp( pTestKey->GetName(), "allowedpickups" ) )
{
@@ -270,4 +270,4 @@ void CHalfLife2Survival::CreateStandardEntities( void )
#endif
#endif
#endif
game/shared/portal/portal_gamerules.cpp
+1 -1
View File
@@ -1265,7 +1265,7 @@ CAmmoDef *GetAmmoDef()
def.AddAmmoType("Grenade", DMG_BURN, TRACER_NONE, "sk_plr_dmg_grenade", "sk_npc_dmg_grenade", "sk_max_grenade", 0, 0);
def.AddAmmoType("Thumper", DMG_SONIC, TRACER_NONE, 10, 10, 2, 0, 0 );
def.AddAmmoType("Gravity", DMG_CLUB, TRACER_NONE, 0, 0, 8, 0, 0 );
def.AddAmmoType("Battery", DMG_CLUB, TRACER_NONE, NULL, NULL, NULL, 0, 0 );
def.AddAmmoType("Battery", DMG_CLUB, TRACER_NONE, 0, 0, 0, 0, 0 );
def.AddAmmoType("GaussEnergy", DMG_SHOCK, TRACER_NONE, "sk_jeep_gauss_damage", "sk_jeep_gauss_damage", "sk_max_gauss_round", BULLET_IMPULSE(650, 8000), 0 ); // hit like a 10kg weight at 400 in/s
def.AddAmmoType("CombineCannon", DMG_BULLET, TRACER_LINE, "sk_npc_dmg_gunship_to_plr", "sk_npc_dmg_gunship", NULL, 1.5 * 750 * 12, 0 ); // hit like a 1.5kg weight at 750 ft/s
def.AddAmmoType("AirboatGun", DMG_AIRBOAT, TRACER_LINE, "sk_plr_dmg_airboat", "sk_npc_dmg_airboat", NULL, BULLET_IMPULSE(10, 600), 0 );