summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Darkel.cpp2
-rw-r--r--src/control/Script.h4
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