arm64 : fix clang compile errors

This commit is contained in:
hymei
2022-06-05 01:13:14 +03:00
committed by nillerusr
parent 3bc519aecf
commit f96a163cf8
7 changed files with 27 additions and 14 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ public:
KeyValues *line = lines->GetFirstValue();
while ( line )
{
const char *str = line->GetString( NULL, "" );
const char *str = line->GetString( nullptr, "" );
Vector4D p;
int numPoints = sscanf( str, "%f %f %f %f", &p[0], &p[1], &p[2], &p[3] );
if ( numPoints == 4 )
+2 -1
View File
@@ -5618,7 +5618,8 @@ class CPhysicsPropMultiplayer : public CPhysicsProp, public IMultiplayerPhysics
SetCollisionGroup( COLLISION_GROUP_DEBRIS );
}
m_fMass = VPhysicsGetObject()->GetMass();
if(VPhysicsGetObject())
m_fMass = VPhysicsGetObject()->GetMass();
// VPhysicsGetObject() is NULL on the client, which prevents the client from finding a decent
// AABB surrounding the collision bounds. If we've got a VPhysicsGetObject()->GetCollide(), we'll
+3 -1
View File
@@ -99,7 +99,9 @@ CCSWeaponInfo g_EquipmentInfo[MAX_EQUIPMENT];
void PrepareEquipmentInfo( void )
{
memset( g_EquipmentInfo, 0, ARRAYSIZE( g_EquipmentInfo ) );
// MoeMod : dont use memset here
for(int i = 0; i < MAX_EQUIPMENT; ++i)
g_EquipmentInfo[i] = {};
g_EquipmentInfo[2].SetWeaponPrice( CSGameRules()->GetBlackMarketPriceForWeapon( WEAPON_KEVLAR ) );
g_EquipmentInfo[2].SetDefaultPrice( KEVLAR_PRICE );