summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-17 17:08:26 +0200
committerGitHub <noreply@github.com>2020-04-17 17:08:26 +0200
commit1c74d111e8cafa4ad70837725c71f6d478390f01 (patch)
tree818918190bf4403c32137d7348a77e23b643a669 /src/objects/Object.h
parentimplemented CVector2D::NormaliseSafe for SkidMarks (diff)
parentappveyor setup (diff)
downloadre3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar.gz
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar.bz2
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar.lz
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar.xz
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.tar.zst
re3-1c74d111e8cafa4ad70837725c71f6d478390f01.zip
Diffstat (limited to 'src/objects/Object.h')
-rw-r--r--src/objects/Object.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 6d04c78a..0c00f441 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -73,8 +73,8 @@ public:
CEntity *m_pCollidingEntity;
int8 m_colour1, m_colour2;
- static int16 &nNoTempObjects;
- static int16 &nBodyCastHealth;
+ static int16 nNoTempObjects;
+ static int16 nBodyCastHealth;
static void *operator new(size_t);
static void *operator new(size_t, int);
@@ -99,6 +99,6 @@ public:
static void DeleteAllMissionObjects();
static void DeleteAllTempObjects();
- static void DeleteAllTempObjectInArea(CVector point, float fRadius);
+ static void DeleteAllTempObjectsInArea(CVector point, float fRadius);
};
static_assert(sizeof(CObject) == 0x198, "CObject: error");