Merge branch 'master' into script_dev

This commit is contained in:
Nikolay Korolev 2019-10-12 22:24:58 +03:00
commit a1700eeaa4
10 changed files with 299 additions and 23 deletions

View file

@ -766,6 +766,7 @@ public:
void SetPedState(PedState state) { m_nPedState = state; }
bool DyingOrDead(void) { return m_nPedState == PED_DIE || m_nPedState == PED_DEAD; }
void ReplaceWeaponWhenExitingVehicle(void);
bool IsNotInWreckedVehicle();
// set by 0482:set_threat_reaction_range_multiplier opcode
static uint16 &nThreatReactionRangeMultiplier;