diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 09:17:38 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 09:17:38 +0200 |
commit | b9c8ce0d37b2f094e2d8fe1a71db009718a0a006 (patch) | |
tree | 4861c474aa232d2914f5b6b3bc11a8e62a9ceccb /src/objects | |
parent | Merge remote-tracking branch 'samler/world' into Standalone (diff) | |
parent | rem refs (diff) | |
download | re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.gz re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.bz2 re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.lz re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.xz re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.zst re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.zip |
Diffstat (limited to 'src/objects')
-rw-r--r-- | src/objects/Object.cpp | 4 | ||||
-rw-r--r-- | src/objects/Object.h | 4 | ||||
-rw-r--r-- | src/objects/ParticleObject.cpp | 8 | ||||
-rw-r--r-- | src/objects/ParticleObject.h | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 88773b83..c22148e9 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -12,8 +12,8 @@ #include "World.h" #include "Floater.h" -int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2; -int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000 +int16 CObject::nNoTempObjects; +int16 CObject::nBodyCastHealth = 1000; void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); } void *CObject::operator new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);}; diff --git a/src/objects/Object.h b/src/objects/Object.h index 80c742a0..0c00f441 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -73,8 +73,8 @@ public: CEntity *m_pCollidingEntity; int8 m_colour1, m_colour2; - static int16 &nNoTempObjects; - static int16 &nBodyCastHealth; + static int16 nNoTempObjects; + static int16 nBodyCastHealth; static void *operator new(size_t); static void *operator new(size_t, int); diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 60827411..5e4ad231 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -9,11 +9,11 @@ #include "Game.h" -CParticleObject (&gPObjectArray)[MAX_PARTICLEOBJECTS] = *(CParticleObject(*)[MAX_PARTICLEOBJECTS])*(uintptr*)0x62A58C; +CParticleObject gPObjectArray[MAX_PARTICLEOBJECTS]; -CParticleObject *&CParticleObject::pCloseListHead = *(CParticleObject **)int(0x8F4340); -CParticleObject *&CParticleObject::pFarListHead = *(CParticleObject **)int(0x942F78); -CParticleObject *&CParticleObject::pUnusedListHead = *(CParticleObject **)int(0x94128C); +CParticleObject *CParticleObject::pCloseListHead; +CParticleObject *CParticleObject::pFarListHead; +CParticleObject *CParticleObject::pUnusedListHead; CAudioHydrant List[MAX_AUDIOHYDRANTS]; diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h index 45a3fa30..cfa5936d 100644 --- a/src/objects/ParticleObject.h +++ b/src/objects/ParticleObject.h @@ -62,9 +62,9 @@ public: int8 m_nCreationChance; char _pad1[2]; - static CParticleObject *&pCloseListHead; - static CParticleObject *&pFarListHead; - static CParticleObject *&pUnusedListHead; + static CParticleObject *pCloseListHead; + static CParticleObject *pFarListHead; + static CParticleObject *pUnusedListHead; CParticleObject(); ~CParticleObject(); @@ -89,7 +89,7 @@ public: static void MoveToList(CParticleObject **from, CParticleObject **to, CParticleObject *obj); }; -extern CParticleObject (&gPObjectArray)[MAX_PARTICLEOBJECTS]; +extern CParticleObject gPObjectArray[MAX_PARTICLEOBJECTS]; class CAudioHydrant { |