diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 03:54:01 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-18 03:54:01 +0200 |
| commit | b3385015e5b151031afba52f71536063339f52e7 (patch) | |
| tree | 352d983b14c36d821c7d2a747e3f72f9129c688e /src/control | |
| parent | Pickup arrays done (diff) | |
| parent | Merge pull request #765 from erorcun/miami (diff) | |
| download | re3-b3385015e5b151031afba52f71536063339f52e7.tar re3-b3385015e5b151031afba52f71536063339f52e7.tar.gz re3-b3385015e5b151031afba52f71536063339f52e7.tar.bz2 re3-b3385015e5b151031afba52f71536063339f52e7.tar.lz re3-b3385015e5b151031afba52f71536063339f52e7.tar.xz re3-b3385015e5b151031afba52f71536063339f52e7.tar.zst re3-b3385015e5b151031afba52f71536063339f52e7.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Darkel.cpp | 2 | ||||
| -rw-r--r-- | src/control/Script.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index 13c49c99..e44cdda9 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -391,7 +391,7 @@ CDarkel::DealWithWeaponChangeAtEndOfFrenzy() CPlayerPed* player = FindPlayerPed(); if (fixedWeapon < WEAPONTYPE_TOTALWEAPONS) { - player->m_nSelectedWepSlot = InterruptedWeaponType; + player->m_nSelectedWepSlot = CWeaponInfo::GetWeaponInfo((eWeaponType)InterruptedWeaponSelected)->m_nWeaponSlot; player->GiveWeapon((eWeaponType)InterruptedWeaponType, AmmoInterruptedWeapon, true); } diff --git a/src/control/Script.h b/src/control/Script.h index c7218847..c63025b2 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -288,8 +288,8 @@ class CTheScripts static uint16 ScriptsUpdated; static uint32 LastMissionPassedTime; static uint16 NumberOfExclusiveMissionScripts; - static bool bPlayerIsInTheStatium; public: + static bool bPlayerIsInTheStatium; static uint8 RiotIntensity; static bool bPlayerHasMetDebbieHarry; public: @@ -562,4 +562,4 @@ void RetryMission(int, int); #ifdef USE_DEBUG_SCRIPT_LOADER extern int scriptToLoad; -#endif
\ No newline at end of file +#endif |