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/objects/Object.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/objects/Object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 867624c7..57713241 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);}; |