diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 21:55:01 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 21:55:01 +0100 |
| commit | 42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96 (patch) | |
| tree | 3a9d0420a04b640e4fa4083302cc56fc09d69011 /src/objects | |
| parent | Merge remote-tracking branch 'upstream/master' into script_dev (diff) | |
| download | re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.gz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.bz2 re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.lz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.xz re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.tar.zst re3-42ff0f7c586b6700dea7729e9f4e1fa5bd42fc96.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/Object.cpp | 2 | ||||
| -rw-r--r-- | src/objects/Object.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index 9d531c9c..de98a2d6 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -9,6 +9,8 @@ WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); } WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); } WRAPPER void CObject::Init(void) { EAXJMP(0x4BAEC0); } +WRAPPER void CObject::ProcessControl(void) { EAXJMP(0x4BB040); } +WRAPPER void CObject::Teleport(CVector) { EAXJMP(0x4BBDA0); } int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2; int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000 diff --git a/src/objects/Object.h b/src/objects/Object.h index 47af4fbf..c07bb233 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -71,6 +71,8 @@ public: CObject(int32, bool); ~CObject(void); + void ProcessControl(void); + void Teleport(CVector); void Render(void); bool SetupLighting(void); void RemoveLighting(bool reset); |