diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-20 19:40:04 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-20 19:40:04 +0200 |
commit | d84650fbe5c9c90e4b1f2a68018fe246029b1dff (patch) | |
tree | 86072a9bc4343c6c430f9d8098262c6c3fdce0ed /src/control/Script.h | |
parent | sync with upstream (diff) | |
download | re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar.gz re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar.bz2 re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar.lz re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar.xz re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.tar.zst re3-d84650fbe5c9c90e4b1f2a68018fe246029b1dff.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Script.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/control/Script.h b/src/control/Script.h index 3393467e..4f9f6b74 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -485,10 +485,11 @@ private: float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; } - bool ThisIsAValidRandomPed(uint32 pedtype) { + bool ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal) { switch (pedtype) { case PEDTYPE_CIVMALE: case PEDTYPE_CIVFEMALE: + return civ; case PEDTYPE_GANG1: case PEDTYPE_GANG2: case PEDTYPE_GANG3: @@ -498,13 +499,16 @@ private: case PEDTYPE_GANG7: case PEDTYPE_GANG8: case PEDTYPE_GANG9: + return gang; case PEDTYPE_CRIMINAL: case PEDTYPE_PROSTITUTE: - return true; + return criminal; default: return false; } } + + bool CheckDamagedWeaponType(int32 type, int32 actual); static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami); }; |