summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-08-03 15:01:13 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-08-03 15:01:13 +0200
commitebbcd92de28d37f1dd36c9120f92c958e394ff75 (patch)
treefc3d907017652eb186c0c690cc81a16feec46e22 /src/control/Pickups.cpp
parentsome CPed cleanup (diff)
downloadre3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar.gz
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar.bz2
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar.lz
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar.xz
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.tar.zst
re3-ebbcd92de28d37f1dd36c9120f92c958e394ff75.zip
Diffstat (limited to '')
-rw-r--r--src/control/Pickups.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 2770a948..81642a85 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -5,7 +5,8 @@
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 };
+uint16 AmmoForWeapon[20] = { 0, 1, 45, 125, 25, 150, 300, 25, 5, 250, 5, 5, 0, 500, 0, 100, 0, 0, 0, 0 };
+uint16 AmmoForWeapon_OnStreet[20] = { 0, 1, 9, 25, 5, 30, 60, 5, 1, 50, 1, 1, 0, 200, 0, 100, 0, 0, 0, 0 };
WRAPPER void CPickups::RenderPickUpText(void) { EAXJMP(0x432440); }
WRAPPER void CPickups::DoCollectableEffects(CEntity *ent) { EAXJMP(0x431C30); }