From 537af79c8edf141be92b29483a9cd577a8cde2ab Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 15 Dec 2014 19:01:54 -0600 Subject: [PATCH] trap.cpp & .h header include cleanup and forward declare --- zone/trap.cpp | 12 +++++++----- zone/trap.h | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/zone/trap.cpp b/zone/trap.cpp index 7d412d7cb..27b12c26d 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -15,13 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" -#include "../common/types.h" -#include "entity.h" -#include "masterentity.h" + #include "../common/spdat.h" -#include "../common/misc_functions.h" #include "../common/string_util.h" +#include "../common/types.h" + +#include "client.h" +#include "entity.h" +#include "mob.h" +#include "trap.h" /* diff --git a/zone/trap.h b/zone/trap.h index ad2e2171a..59a1a3685 100644 --- a/zone/trap.h +++ b/zone/trap.h @@ -18,10 +18,11 @@ #ifndef _TRAP_H #define _TRAP_H -#include "../common/debug.h" - #include "entity.h" +class Mob; +class NPC; + //ID of the NPC type to spawn when a trap is set off, to do the damage #define TRAP_NPC_TYPE 1586