diff options
| author | aap <aap@papnet.eu> | 2019-07-26 01:34:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 01:34:40 +0200 |
| commit | 01bbb0530b3ede5d45eb730696b64f87eb1c1045 (patch) | |
| tree | f86d3d0e5b4ec32026775eb9ede17e894d6ca40e /src/objects/Object.cpp | |
| parent | Merge pull request #162 from erorcun/erorcun (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.gz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.bz2 re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.lz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.xz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.zst re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.zip | |
Diffstat (limited to 'src/objects/Object.cpp')
| -rw-r--r-- | src/objects/Object.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index f3ba8087..bba4d7d9 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -8,6 +8,7 @@ WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); } WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); } +WRAPPER void CObject::Init(void) { EAXJMP(0x4BAEC0); } int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2; int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000 @@ -41,6 +42,15 @@ CObject::CObject(void) m_pCollidingEntity = nil; } +CObject::CObject(int32 mi, bool createRW) +{ + if (createRW) + SetModelIndex(mi); + else + SetModelIndexNoCreate(mi); + Init(); +} + CObject::~CObject(void) { CRadar::ClearBlipForEntity(BLIP_OBJECT, CPools::GetObjectPool()->GetIndex(this)); |