summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-13 20:54:25 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-13 20:54:25 +0200
commit3b0cd93f89a9fea54b155fdae15ec56c6291c2cc (patch)
treee32278de01df4baf561b3966ef239bd045372e60 /src/control/Pickups.h
parentobviously forgot about it (diff)
parentMerge pull request #412 from whampson/save-stuff (diff)
downloadre3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar.gz
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar.bz2
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar.lz
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar.xz
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.tar.zst
re3-3b0cd93f89a9fea54b155fdae15ec56c6291c2cc.zip
Diffstat (limited to 'src/control/Pickups.h')
-rw-r--r--src/control/Pickups.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 3e075b24..b5b4f396 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -102,8 +102,31 @@ extern uint16 AmmoForWeapon[20];
extern uint16 AmmoForWeapon_OnStreet[20];
extern uint16 CostOfWeapon[20];
+enum ePacmanPickupType
+{
+ PACMAN_NONE,
+ PACMAN_SCRAMBLE,
+ PACMAN_RACE,
+};
+
+class CPacManPickup
+{
+public:
+ CVector m_vecPosn;
+ CObject *m_pObject;
+ uint8 m_eType;
+
+ void Update();
+};
+
class CPacManPickups
{
+ friend CPacManPickup;
+
+ static CPacManPickup aPMPickUps[NUMPACMANPICKUPS];
+ static CVector LastPickUpCoors;
+ static int PillsEatenInRace;
+ static bool bPMActive;
public:
static void Init(void);
static void Update(void);
@@ -111,11 +134,11 @@ public:
static void GeneratePMPickUpsForRace(int32);
static void GenerateOnePMPickUp(CVector);
static void Render(void);
- static void DoCleanUpPacManStuff(void);
static void StartPacManRace(int32);
static void StartPacManRecord(void);
static uint32 QueryPowerPillsEatenInRace(void);
static void ResetPowerPillsEatenInRace(void);
+ static void ClearPMPickUps(void);
static void CleanUpPacManStuff(void);
static void StartPacManScramble(CVector, float, int16);
static uint32 QueryPowerPillsCarriedByPlayer(void);