archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-17 21:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into garages_dev

Browse Source
This commit is contained in:
Nikolay Korolev
2020-03-28 15:24:55 +03:00
parent 268f92bfbe 739e80614d
commit 9fb101fdd9
70 changed files with 6495 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vehicles/Vehicle.h
View File

@ -266,6 +266,7 @@ public:
void ProcessCarAlarm(void);
bool IsSphereTouchingVehicle(float sx, float sy, float sz, float radius);
bool ShufflePassengersToMakeSpace(void);
void InflictDamage(CEntity *damagedBy, uint32 weaponType, float damage);
bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; }
CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); }