1 files changed, 31 insertions, 9 deletions

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 411e245a..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)
 {
@@ -63,7 +85,7 @@ CObject::CObject(CDummyObject *dummy)
 	if (dummy->m_rwObject)
 		AttachToRwObject(dummy->m_rwObject);
 	else
-		GetMatrix() = dummy->GetMatrix();
+		SetMatrix(dummy->GetMatrix());
 
 	m_objectMatrix = dummy->GetMatrix();
 	dummy->DetachFromRwObject();
@@ -112,8 +134,8 @@ void
 CObject::Teleport(CVector vecPos)
 { 
 	CWorld::Remove(this);
-	m_matrix.GetPosition() = vecPos;
-	m_matrix.UpdateRW();
+	GetMatrix().GetPosition() = vecPos;
+	GetMatrix().UpdateRW();
 	UpdateRwFrame();
 	CWorld::Add(this);
 }
@@ -170,7 +192,7 @@ CObject::ObjectDamage(float amount)
 		amount = 0.0f;
 	}
 	if ((amount * m_fCollisionDamageMultiplier > 150.0f || bBodyCastDamageEffect) && m_nCollisionDamageEffect) {
-		const CVector& vecPos = m_matrix.GetPosition();
+		const CVector& vecPos = GetMatrix().GetPosition();
 		const float fDirectionZ = 0.0002f * amount;
 		switch (m_nCollisionDamageEffect)
 		{
@@ -329,7 +351,7 @@ CObject::Init(void)
 	m_pCollidingEntity = nil;
 	CColPoint point;
 	CEntity* outEntity = nil;
-	const CVector& vecPos = m_matrix.GetPosition();
+	const CVector& vecPos = GetMatrix().GetPosition();
 	if (CWorld::ProcessVerticalLine(vecPos, vecPos.z - 10.0f, point, outEntity, true, false, false, false, false, false, nil))
 		m_pCurSurface = outEntity;
 	else