summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-14 23:26:27 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-14 23:26:27 +0200
commitef4c8f53c5d43cc3ea36b383bf7810acf96fe14f (patch)
treefbbefd0d2224a021a383e74f805c3c322473ff42 /src/control
parentmuch better mission switcher (diff)
parentsome more camera stuff (diff)
downloadre3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar.gz
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar.bz2
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar.lz
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar.xz
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.tar.zst
re3-ef4c8f53c5d43cc3ea36b383bf7810acf96fe14f.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Pickups.cpp2
-rw-r--r--src/control/Pickups.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 2de30a0a..1ab09d52 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -36,6 +36,8 @@ int16 CPickups::NumMessages;
int32 CPickups::aPickUpsCollected[NUMCOLLECTEDPICKUPS];
int16 CPickups::CollectedPickUpIndex;
+int32 CPickups::PlayerOnWeaponPickup;
+
// unused
bool CPickups::bPickUpcamActivated;
CVehicle *CPickups::pPlayerVehicle;
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 0a73696a..423f864b 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -70,6 +70,8 @@ class CPickups
static int16 NumMessages;
static tPickupMessage aMessages[NUMPICKUPMESSAGES];
public:
+ static int32 PlayerOnWeaponPickup;
+
static void Init();
static void Update();
static void RenderPickUpText();