diff options
author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-06-25 23:27:12 +0200 |
---|---|---|
committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-06-25 23:27:20 +0200 |
commit | 9b5caa190e30131e361e77e0921653d13f5d124f (patch) | |
tree | b2e1ca16ed14d268e546c0e07db87743b2bb6f17 /src/objects/Object.cpp | |
parent | Revert "Redo ReadSaveBuf + common.h cleanup" (diff) | |
download | re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar.gz re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar.bz2 re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar.lz re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar.xz re3-9b5caa190e30131e361e77e0921653d13f5d124f.tar.zst re3-9b5caa190e30131e361e77e0921653d13f5d124f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/objects/Object.cpp | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 85936bb8..2a7de2c7 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -16,10 +16,32 @@ 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);}; -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); } +// Object pools tends to be full sometimes, let's free a temp. object in this case. +#ifdef FIX_BUGS +void *CObject::operator new(size_t sz) throw() { + CObject *obj = CPools::GetObjectPool()->New(); + if (!obj) { + CObjectPool *objectPool = CPools::GetObjectPool(); + for (int32 i = 0; i < objectPool->GetSize(); i++) { + CObject *existing = objectPool->GetSlot(i); + if (existing && existing->ObjectCreatedBy == TEMP_OBJECT) { + int32 handle = objectPool->GetIndex(existing); + CWorld::Remove(existing); + delete existing; + obj = objectPool->New(handle); + break; + } + } + } + return obj; +} +#else +void *CObject::operator new(size_t sz) throw() { return CPools::GetObjectPool()->New(); } +#endif +void *CObject::operator new(size_t sz, int handle) throw() { return CPools::GetObjectPool()->New(handle); }; + +void CObject::operator delete(void *p, size_t sz) throw() { CPools::GetObjectPool()->Delete((CObject*)p); } +void CObject::operator delete(void *p, int handle) throw() { CPools::GetObjectPool()->Delete((CObject*)p); } CObject::CObject(void) { |