diff options
author | eray orçunus <erayorcunus@gmail.com> | 2019-10-04 00:18:47 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2019-10-04 00:18:47 +0200 |
commit | 6b4f6e05e2612af715246de58c28128d358b6916 (patch) | |
tree | dc2490e7fd6dc7123991840401048c06da6cd3ec /src/objects/Object.cpp | |
parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
parent | Fixed disappearing ammo count (diff) | |
download | re3-6b4f6e05e2612af715246de58c28128d358b6916.tar re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.gz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.bz2 re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.lz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.xz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.zst re3-6b4f6e05e2612af715246de58c28128d358b6916.zip |
Diffstat (limited to '')
-rw-r--r-- | src/objects/Object.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index bba4d7d9..9d531c9c 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -14,7 +14,9 @@ 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 new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);}; void CObject::operator delete(void *p, size_t sz) { CPools::GetObjectPool()->Delete((CObject*)p); } +void CObject::operator delete(void *p, int handle) { CPools::GetObjectPool()->Delete((CObject*)p); } CObject::CObject(void) { @@ -32,7 +34,7 @@ CObject::CObject(void) field_172 = 0; bIsPickup = false; m_obj_flag2 = false; - m_obj_flag4 = false; + bOutOfStock = false; m_obj_flag8 = false; m_obj_flag10 = false; bHasBeenDamaged = false; |