summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-03-07 20:22:43 +0100
committereray orçunus <erayorcunus@gmail.com>2020-03-11 22:48:33 +0100
commit934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b (patch)
tree26b313998ecea484fc7d81d32c1bdfc8b19deacf /src/objects
parentMerge pull request #342 from Nick007J/master (diff)
downloadre3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar.gz
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar.bz2
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar.lz
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar.xz
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.tar.zst
re3-934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/DummyObject.cpp6
-rw-r--r--src/objects/Object.h2
2 files changed, 6 insertions, 2 deletions
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;