diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-05-17 19:36:48 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-17 20:01:52 +0200 |
| commit | 84f8312b8666b2774eafbbb0e6d034ba598fd69c (patch) | |
| tree | a901ba3684ab78346f415a6a4d3920312fb92c84 /src/control/Pickups.h | |
| parent | Weapon fixes (diff) | |
| download | re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar.gz re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar.bz2 re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar.lz re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar.xz re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.tar.zst re3-84f8312b8666b2774eafbbb0e6d034ba598fd69c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/Pickups.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h index 2842edfa..79f52a67 100644 --- a/src/control/Pickups.h +++ b/src/control/Pickups.h @@ -85,11 +85,12 @@ public: static bool IsPickUpPickedUp(int32 pickupId); static int32 ModelForWeapon(eWeaponType weaponType); static enum eWeaponType WeaponForModel(int32 model); - static int32 FindColourIndexForWeaponMI(int32 model); static int32 GetActualPickupIndex(int32 index); static int32 GetNewUniquePickupIndex(int32 slot); static void PassTime(uint32 time); static bool GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex); + static bool TestForPickupsInBubble(CVector pos, float range); + static bool TryToMerge_WeaponType(CVector pos, eWeaponType weapon, uint8 type, uint32 quantity, bool unused); static void Load(uint8 *buf, uint32 size); static void Save(uint8 *buf, uint32 *size); @@ -103,7 +104,7 @@ public: }; extern uint16 AmmoForWeapon[20]; -extern uint16 AmmoForWeapon_OnStreet[20]; +extern uint16 AmmoForWeapon_OnStreet[WEAPONTYPE_TOTALWEAPONS]; extern uint16 CostOfWeapon[20]; enum ePacmanPickupType |