diff options
| author | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
| commit | 74fcbc8c0a6bbac8e8057655c5f1133e15c63656 (patch) | |
| tree | 75dabaa5dc285f1541c6ee058028c7f57095eecf /src/objects | |
| parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
| download | re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.gz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.bz2 re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.lz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.xz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.zst re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/Object.cpp | 1 | ||||
| -rw-r--r-- | src/objects/Object.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 9bfaf681..f3ba8087 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -10,6 +10,7 @@ WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); } WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); } int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2; +int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000 void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); } void CObject::operator delete(void *p, size_t sz) { CPools::GetObjectPool()->Delete((CObject*)p); } diff --git a/src/objects/Object.h b/src/objects/Object.h index d31a998a..0ce1a3aa 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -60,6 +60,7 @@ public: int8 m_colour1, m_colour2; static int16 &nNoTempObjects; + static int16 &nBodyCastHealth; static void *operator new(size_t); static void operator delete(void*, size_t); |