summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-07-10 14:56:56 +0200
committereray orçunus <erayorcunus@gmail.com>2019-07-10 14:56:56 +0200
commit2ef5e4cd662d642b839a9e65b3176335c6b50448 (patch)
tree5e0a6dcdbf8f1566974c0514986ab7b61e5c067a /src/objects
parentPhone start, ped spinning and cop car fix, and some love to CPed (diff)
parentfixed COMMAND_IS_PLAYER_IN_AREA_3D (diff)
downloadre3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar.gz
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar.bz2
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar.lz
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar.xz
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.tar.zst
re3-2ef5e4cd662d642b839a9e65b3176335c6b50448.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Object.cpp10
-rw-r--r--src/objects/Object.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index e13a2ad0..f3ba8087 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -7,8 +7,10 @@
#include "Object.h"
WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); }
+WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2;
+int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000
void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); }
void CObject::operator delete(void *p, size_t sz) { CPools::GetObjectPool()->Delete((CObject*)p); }
@@ -85,7 +87,13 @@ CObject::RemoveLighting(bool reset)
WorldReplaceScorchedLightsWithNormal(Scene.world);
}
-WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
+
+void
+CObject::RefModelInfo(int32 modelId)
+{
+ m_nRefModelIndex = modelId;
+ CModelInfo::GetModelInfo(modelId)->AddRef();
+}
class CObject_ : public CObject
{
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 8afc4d0a..0ce1a3aa 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -60,6 +60,7 @@ public:
int8 m_colour1, m_colour2;
static int16 &nNoTempObjects;
+ static int16 &nBodyCastHealth;
static void *operator new(size_t);
static void operator delete(void*, size_t);
@@ -72,6 +73,7 @@ public:
void RemoveLighting(bool reset);
void ObjectDamage(float amount);
+ void RefModelInfo(int32 modelId);
static void DeleteAllTempObjectInArea(CVector, float);
};