summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-03-28 17:12:22 +0100
committerGitHub <noreply@github.com>2020-03-28 17:12:22 +0100
commitc056871e0766c587e45797405f6432715beba810 (patch)
tree8b0d0c7f364decebaaeacc8a328491404213964a /src/objects
parentMerge pull request #362 from Fire-Head/master (diff)
parentCCopPed done and #include cleanup (diff)
downloadre3-c056871e0766c587e45797405f6432715beba810.tar
re3-c056871e0766c587e45797405f6432715beba810.tar.gz
re3-c056871e0766c587e45797405f6432715beba810.tar.bz2
re3-c056871e0766c587e45797405f6432715beba810.tar.lz
re3-c056871e0766c587e45797405f6432715beba810.tar.xz
re3-c056871e0766c587e45797405f6432715beba810.tar.zst
re3-c056871e0766c587e45797405f6432715beba810.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Object.cpp1
-rw-r--r--src/objects/Object.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 809ba971..89959975 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -5,6 +5,7 @@
#include "Pools.h"
#include "Radar.h"
#include "Object.h"
+#include "DummyObject.h"
WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); }
WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
diff --git a/src/objects/Object.h b/src/objects/Object.h
index b9c570f5..9fcf9c0c 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -1,7 +1,6 @@
#pragma once
#include "Physical.h"
-#include "DummyObject.h"
enum {
GAME_OBJECT = 1,
@@ -26,6 +25,7 @@ enum {
};
class CVehicle;
+class CDummyObject;
class CObject : public CPhysical
{