diff options
author | aap <aap@papnet.eu> | 2019-10-03 22:34:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-03 22:34:58 +0200 |
commit | 03df2d57167aea3e1b846ec84c992129e32f1c01 (patch) | |
tree | bdf0cb781dd777239f00b0e105cb22847622700d /src/objects/Object.cpp | |
parent | Merge pull request #219 from Sergeanur/MoneyMessages (diff) | |
parent | Fixed some formatting (diff) | |
download | re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar.gz re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar.bz2 re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar.lz re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar.xz re3-03df2d57167aea3e1b846ec84c992129e32f1c01.tar.zst re3-03df2d57167aea3e1b846ec84c992129e32f1c01.zip |
Diffstat (limited to 'src/objects/Object.cpp')
-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; |