diff options
author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-04-17 07:54:14 +0200 |
---|---|---|
committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-04-17 07:54:14 +0200 |
commit | a4922d5cb77e31657768d5da4b286a2e67ee0e6f (patch) | |
tree | c54c73ac29fbde0233614c60423f662318d2a167 /src/control/Pickups.cpp | |
parent | Merge pull request #455 from erorcun/erorcun (diff) | |
download | re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar.gz re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar.bz2 re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar.lz re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar.xz re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.tar.zst re3-a4922d5cb77e31657768d5da4b286a2e67ee0e6f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Pickups.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index eb561670..d52c386c 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -31,16 +31,16 @@ #include "WaterLevel.h" #include "World.h" -CPickup(&CPickups::aPickUps)[NUMPICKUPS] = *(CPickup(*)[NUMPICKUPS])*(uintptr*)0x878C98; -int16 CPickups::NumMessages;// = *(int16*)0x95CC98; -int32 CPickups::aPickUpsCollected[NUMCOLLECTEDPICKUPS];// = *(int32(*)[NUMCOLLECTEDPICKUPS])*(uintptr*)0x87C538; -int16 CPickups::CollectedPickUpIndex;// = *(int16*)0x95CC8A; +CPickup CPickups::aPickUps[NUMPICKUPS]; +int16 CPickups::NumMessages; +int32 CPickups::aPickUpsCollected[NUMCOLLECTEDPICKUPS]; +int16 CPickups::CollectedPickUpIndex; // unused -bool &CPickups::bPickUpcamActivated = *(bool*)0x95CD71; -CVehicle *&CPickups::pPlayerVehicle = *(CVehicle**)0x8F29E8; -CVector &CPickups::StaticCamCoors = *(CVector*)0x9404C8; -uint32 &CPickups::StaticCamStartTime = *(uint32*)0x8E289C; +bool CPickups::bPickUpcamActivated; +CVehicle *CPickups::pPlayerVehicle; +CVector CPickups::StaticCamCoors; +uint32 CPickups::StaticCamStartTime; tPickupMessage CPickups::aMessages[NUMPICKUPMESSAGES]; |