summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-03-28 15:47:52 +0100
committereray orçunus <erayorcunus@gmail.com>2020-03-28 16:52:25 +0100
commit112685ebac0a4f5da50fdc60ff71c35a5cddbdfa (patch)
treefb1223f514ddbf339bed0bed6a269ad1ad63c374 /src/objects
parentremove include <new> from common.h (diff)
downloadre3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.gz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.bz2
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.lz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.xz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.zst
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.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
{