summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-30 21:06:55 +0200
committeraap <aap@papnet.eu>2019-06-30 21:06:55 +0200
commitaf2e764d81d6a5981bab0a0d1fd0c79cf2465f69 (patch)
tree7b3202766bcbe9711d4a0a24952bca3c4e39d6ae /src/control/Pickups.h
parentMerge pull request #79 from Nick007J/master (diff)
downloadre3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.gz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.bz2
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.lz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.xz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.zst
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.zip
Diffstat (limited to 'src/control/Pickups.h')
-rw-r--r--src/control/Pickups.h40
1 files changed, 37 insertions, 3 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 3ae2764c..9cf485d0 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -1,14 +1,48 @@
#pragma once
-#include "config.h"
-#include "Pickup.h"
+enum ePickupType
+{
+ PICKUP_NONE = 0,
+ PICKUP_IN_SHOP = 1,
+ PICKUP_ON_STREET = 2,
+ PICKUP_ONCE = 3,
+ PICKUP_ONCE_TIMEOUT = 4,
+ PICKUP_COLLECTABLE1 = 5,
+ PICKUP_IN_SHOP_OUT_OF_STOCK = 6,
+ PICKUP_MONEY = 7,
+ PICKUP_MINE_INACTIVE = 8,
+ PICKUP_MINE_ARMED = 9,
+ PICKUP_NAUTICAL_MINE_INACTIVE = 10,
+ PICKUP_NAUTICAL_MINE_ARMED = 11,
+ PICKUP_FLOATINGPACKAGE = 12,
+ PICKUP_FLOATINGPACKAGE_FLOATING = 13,
+ PICKUP_ON_STREET_SLOW = 14,
+};
+
+class CEntity;
+class CObject;
+
+class CPickup
+{
+ ePickupType m_eType;
+ uint16 m_wQuantity;
+ CObject *m_pObject;
+ uint32 m_nTimer;
+ int16 m_eModelIndex;
+ int16 m_wIndex;
+ CVector m_vecPos;
+};
class CPickups
{
public:
static void RenderPickUpText(void);
+ static void DoCollectableEffects(CEntity *ent);
+ static void DoMoneyEffects(CEntity *ent);
+ static void DoMineEffects(CEntity *ent);
+ static void DoPickUpEffects(CEntity *ent);
- static CPickup(&aPickUps)[NUMPICKUPS];
+ static CPickup (&aPickUps)[NUMPICKUPS];
};
class CPacManPickups