diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-02-02 15:02:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 15:02:15 +0100 |
| commit | 3c80b07d120244b6c671f3dc99bcc9c4034998be (patch) | |
| tree | ab7c893d774ed6a07d0d83d729b5df7a08df5b7b /src/control | |
| parent | fixed firetruck crash (diff) | |
| parent | Some fixes and some cosmetic things (diff) | |
| download | re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.gz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.bz2 re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.lz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.xz re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.tar.zst re3-3c80b07d120244b6c671f3dc99bcc9c4034998be.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Garages.cpp | 4 | ||||
| -rw-r--r-- | src/control/Garages.h | 2 | ||||
| -rw-r--r-- | src/control/Script.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index dc77a154..04bfb5a2 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -93,11 +93,11 @@ int32 CGarages::QueryCarsCollected(int16 garage) void CGarages::GivePlayerDetonator() { FindPlayerPed()->GiveWeapon(WEAPONTYPE_DETONATOR, 1); - FindPlayerPed()->m_weapons[FindPlayerPed()->GetWeaponSlot(WEAPONTYPE_DETONATOR)].m_eWeaponState = WEAPONSTATE_READY; + FindPlayerPed()->GetWeapon(FindPlayerPed()->GetWeaponSlot(WEAPONTYPE_DETONATOR)).m_eWeaponState = WEAPONSTATE_READY; } WRAPPER bool CGarages::HasThisCarBeenCollected(int16 garage, uint8 id) { EAXJMP(0x426D50); } -WRAPPER void CGarages::ChangeGarageType(int16 garage, eGarageType type) { EAXJMP(0x4222A0); } +WRAPPER void CGarages::ChangeGarageType(int16 garage, eGarageType type, int32 unk) { EAXJMP(0x4222A0); } WRAPPER bool CGarages::HasResprayHappened(int16 garage) { EAXJMP(0x4274F0); } void CGarage::OpenThisGarage() diff --git a/src/control/Garages.h b/src/control/Garages.h index 945922fe..7cb25445 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -146,7 +146,7 @@ public: static void DeActivateGarage(int16); static int32 QueryCarsCollected(int16); static bool HasThisCarBeenCollected(int16, uint8); - static void ChangeGarageType(int16, eGarageType); + static void ChangeGarageType(int16, eGarageType, int32); static bool HasResprayHappened(int16); static void GivePlayerDetonator(); }; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index a3d4a747..84d4f179 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -6176,7 +6176,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command) } case COMMAND_CHANGE_GARAGE_TYPE: CollectParameters(&m_nIp, 2); - CGarages::ChangeGarageType(ScriptParams[0], (eGarageType)ScriptParams[1]); + CGarages::ChangeGarageType(ScriptParams[0], (eGarageType)ScriptParams[1], 0); return 0; case COMMAND_ACTIVATE_CRUSHER_CRANE: { |