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/Object.cpp | |
| 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/Object.cpp')
| -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 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);}; |