summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-02 14:02:02 +0200
committerGitHub <noreply@github.com>2019-08-02 14:02:02 +0200
commite30cfaf6871073ba56a5245d4d1b4da0eab784a3 (patch)
tree73434501fcd8b2167daf88c83c5a1e0f40671780 /src/control/Pickups.cpp
parentimplemented CPlane (diff)
parentThe Peds (diff)
downloadre3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.gz
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.bz2
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.lz
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.xz
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.zst
re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.zip
Diffstat (limited to 'src/control/Pickups.cpp')
-rw-r--r--src/control/Pickups.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index c93798fe..2770a948 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -4,11 +4,16 @@
CPickup(&CPickups::aPickUps)[NUMPICKUPS] = *(CPickup(*)[NUMPICKUPS])*(uintptr*)0x878C98;
+// 20 ?! Some Miami leftover? (Originally at 0x5ED8D4)
+uint16 CPickups::ms_maxAmmosForWeapons[20] = { 0, 1, 45, 125, 25, 150, 300, 25, 5, 250, 5, 5, 0, 500, 0, 100, 0, 0, 0, 0 };
+
WRAPPER void CPickups::RenderPickUpText(void) { EAXJMP(0x432440); }
WRAPPER void CPickups::DoCollectableEffects(CEntity *ent) { EAXJMP(0x431C30); }
WRAPPER void CPickups::DoMoneyEffects(CEntity *ent) { EAXJMP(0x431F40); }
WRAPPER void CPickups::DoMineEffects(CEntity *ent) { EAXJMP(0x4321C0); }
WRAPPER void CPickups::DoPickUpEffects(CEntity *ent) { EAXJMP(0x431520); }
WRAPPER void CPickups::RemoveAllFloatingPickups() { EAXJMP(0x430800); }
+WRAPPER int32 CPickups::GenerateNewOne(CVector, uint32, uint8, uint32) { EAXJMP(0x4304B0); }
+WRAPPER int32 CPickups::GenerateNewOne_WeaponType(CVector, eWeaponType, uint8, uint32) { EAXJMP(0x430660); }
WRAPPER void CPacManPickups::Render(void) { EAXJMP(0x432F60); }