1 files changed, 8 insertions, 42 deletions

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 867624c7..c0ce38f8 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "main.h"
 #include "Lights.h"
 #include "Pools.h"
@@ -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);};
@@ -35,7 +35,7 @@ CObject::CObject(void)
 	m_colour1 = m_colour2;
 	m_nBonusValue = 0;
 	bIsPickup = false;
-	m_obj_flag2 = false;
+	bPickupObjWithMessage = false;
 	bOutOfStock = false;
 	bGlassCracked = false;
 	bGlassBroken = false;
@@ -214,7 +214,7 @@ CObject::ObjectDamage(float amount)
 				++nFrameGen;
 				int32 currentFrame = nFrameGen & 3;
 				float fRandom = CGeneral::GetRandomNumberInRange(0.01f, 1.0f);
-				RwRGBA randomColor = { color.red * fRandom, color.green * fRandom , color.blue, color.alpha };
+				RwRGBA randomColor = { uint8(color.red * fRandom), uint8(color.green * fRandom) , color.blue, color.alpha };
 				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
@@ -237,7 +237,7 @@ CObject::ObjectDamage(float amount)
 				++nFrameGen;
 				int32 currentFrame = nFrameGen & 3;
 				float fRandom = CGeneral::GetRandomNumberInRange(0.5f, 0.5f);
-				RwRGBA randomColor = { color.red * fRandom, color.green * fRandom , color.blue * fRandom, color.alpha };
+				RwRGBA randomColor = { uint8(color.red * fRandom), uint8(color.green * fRandom), uint8(color.blue * fRandom), color.alpha };
 				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
@@ -315,7 +315,7 @@ CObject::Init(void)
 	ObjectCreatedBy = GAME_OBJECT;
 	bIsStatic = true;
 	bIsPickup = false;
-	m_obj_flag2 = false;
+	bPickupObjWithMessage = false;
 	bOutOfStock = false;
 	bGlassCracked = false;
 	bGlassBroken = false;
@@ -383,7 +383,7 @@ CObject::DeleteAllTempObjects()
 }
 
 void 
-CObject::DeleteAllTempObjectInArea(CVector point, float fRadius) 
+CObject::DeleteAllTempObjectsInArea(CVector point, float fRadius) 
 {
 	CObjectPool *objectPool = CPools::GetObjectPool();
 	for (int32 i = 0; i < objectPool->GetSize(); i++) {
@@ -394,37 +394,3 @@ CObject::DeleteAllTempObjectInArea(CVector point, float fRadius)
 		}
 	}
 }
-
-#include <new>
-
-class CObject_ : public CObject
-{
-public:
-	CObject *ctor(void) { return ::new (this) CObject(); }
-	CObject *ctor(int32 mi, bool createRW) { return ::new (this) CObject(mi, createRW); }
-	CObject *ctor(CDummyObject *dummy) { return ::new (this) CObject(dummy); }
-	void dtor(void) { CObject::~CObject(); }
-	void Render_(void) { CObject::Render(); }
-	void ProcessControl_(void) { CObject::ProcessControl(); }
-	bool SetupLighting_(void) { return CObject::SetupLighting(); }
-	void RemoveLighting_(bool reset) { CObject::RemoveLighting(reset); }
-};
-
-STARTPATCHES
-	InjectHook(0x4BABD0, (CObject* (CObject::*)(void)) &CObject_::ctor, PATCH_JUMP);
-	InjectHook(0x4BACE0, (CObject* (CObject::*)(int32, bool)) &CObject_::ctor, PATCH_JUMP);
-	InjectHook(0x4BAD50, (CObject* (CObject::*)(CDummyObject*)) &CObject_::ctor, PATCH_JUMP);
-	InjectHook(0x4BAE00, &CObject_::dtor, PATCH_JUMP);
-	InjectHook(0x4BB040, &CObject_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x4BBDA0, &CObject::Teleport, PATCH_JUMP);
-	InjectHook(0x4BB1E0, &CObject_::Render_, PATCH_JUMP);
-	InjectHook(0x4A7C90, &CObject_::SetupLighting_, PATCH_JUMP);
-	InjectHook(0x4A7CD0, &CObject_::RemoveLighting_, PATCH_JUMP);
-	InjectHook(0x4BB240, &CObject::ObjectDamage, PATCH_JUMP);
-	InjectHook(0x4BBD80, &CObject::RefModelInfo, PATCH_JUMP);
-	InjectHook(0x4BAEC0, &CObject::Init, PATCH_JUMP);
-	InjectHook(0x4BB010, &CObject::CanBeDeleted, PATCH_JUMP);
-	InjectHook(0x4BBE60, &CObject::DeleteAllMissionObjects, PATCH_JUMP);
-	InjectHook(0x4BBDF0, &CObject::DeleteAllTempObjects, PATCH_JUMP);
-	InjectHook(0x4BBED0, &CObject::DeleteAllTempObjectInArea, PATCH_JUMP);
-ENDPATCHES