From 934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sat, 7 Mar 2020 22:22:43 +0300 Subject: CPopulation done, CCopPed and fixes --- src/objects/DummyObject.cpp | 6 +++++- src/objects/Object.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/objects') diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp index 41b15129..9649cf7a 100644 --- a/src/objects/DummyObject.cpp +++ b/src/objects/DummyObject.cpp @@ -16,8 +16,12 @@ class CDummyObject_ : public CDummyObject { public: void dtor(void) { CDummyObject::~CDummyObject(); } + CDummyObject *ctor(void) { return ::new (this) CDummyObject(); } + CDummyObject *ctor(CObject *obj) { return ::new (this) CDummyObject(obj); } }; STARTPATCHES + InjectHook(0x4BAAF0, (CDummyObject* (CDummyObject::*)(void)) &CDummyObject_::ctor, PATCH_JUMP); + InjectHook(0x4BAB10, (CDummyObject* (CDummyObject::*)(CObject*)) &CDummyObject_::ctor, PATCH_JUMP); InjectHook(0x4BAB70, &CDummyObject_::dtor, PATCH_JUMP); -ENDPATCHES +ENDPATCHES \ No newline at end of file diff --git a/src/objects/Object.h b/src/objects/Object.h index 1c33b07f..b9c570f5 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -52,7 +52,7 @@ public: int8 field_17D; int8 field_17E; int8 field_17F; - int32 m_nEndOfLifeTime; + uint32 m_nEndOfLifeTime; int16 m_nRefModelIndex; int8 field_186; int8 field_187; -- cgit v1.2.3