Fixed Include Hell for Creature Info

TR5Main/Game/Box.h

@@ -3,14 +3,8 @@
 #include "items.h"
 #include "level.h"
 
-enum MOOD_TYPE
-{
-	BORED_MOOD,
-	ATTACK_MOOD,
-	ESCAPE_MOOD,
-	STALK_MOOD
-};
-
+struct CREATURE_INFO;
+struct LOT_INFO;
 enum TARGET_TYPE
 {
 	NO_TARGET,
@@ -18,25 +12,7 @@ enum TARGET_TYPE
 	SECONDARY_TARGET
 };
 
-enum ZoneType
-{
-	ZONE_NULL = -1,  // default zone
-	ZONE_SKELLY = 0,
-	ZONE_BASIC,
-	ZONE_FLYER,
-	ZONE_HUMAN_CLASSIC,
-	ZONE_VON_CROY,
-	ZONE_WATER,
-	ZONE_MAX,
-	/// custom zone (using zone above for LOT.zone):
-	ZONE_HUMAN_JUMP_AND_MONKEY,
-	ZONE_HUMAN_JUMP,
-	ZONE_SPIDER,
-	ZONE_BLOCKABLE, // for trex, shiva, etc..
-	ZONE_SOPHIALEE, // dont want sophia to go down again !
-	ZONE_APE,       // only 2 click climb
-	ZONE_HUMAN_LONGJUMP_AND_MONKEY,
-};
+
 
 struct OBJECT_BONES
 {
@@ -86,13 +62,7 @@ struct OBJECT_BONES
 	}
 };
 
-struct BOX_NODE
-{
-	int exitBox;
-	int searchNumber;
-	int nextExpansion;
-	int boxNumber;
-};
+
 
 struct AI_INFO
 {
@@ -147,49 +117,7 @@ struct BITE_INFO
 	}
 };
 
-struct LOT_INFO
-{
-	std::vector<BOX_NODE> node;
-	int head;
-	int tail;
-	int searchNumber;
-	int blockMask;
-	short step;
-	short drop;
-	short zoneCount;
-	int targetBox;
-	int requiredBox;
-	short fly;
-	bool canJump;
-	bool canMonkey;
-	bool isAmphibious;
-	bool isJumping;
-	bool isMonkeying;
-	PHD_VECTOR target;
-	ZoneType zone;
-};
 
-struct CREATURE_INFO
-{
-	short jointRotation[4];
-	short maximumTurn;
-	short flags;
-	bool alerted;
-	bool headLeft;
-	bool headRight;
-	bool reachedGoal;
-	bool hurtByLara;
-	bool patrol2;
-	bool jumpAhead;
-	bool monkeyAhead;
-	MOOD_TYPE mood;
-	ITEM_INFO* enemy;
-	ITEM_INFO aiTarget;
-	short pad;
-	short itemNum;
-	PHD_VECTOR target;
-	LOT_INFO LOT;
-};
 
 struct EntityStoringInfo
 {

TR5Main/Game/Lara/lara_fire.cpp

@@ -19,7 +19,7 @@
 #include "savegame.h"
 #include "GameFlowScript.h"
 #include "lara_struct.h"
-
+#include "creature.h"
 WEAPON_INFO Weapons[NUM_WEAPONS] =
 {
 	/* No weapons */

TR5Main/Game/Lara/lara_struct.h

@@ -980,7 +980,7 @@ struct AnimsNew
 	bool OscillateHanging;			//the thin ledge grab animation from TR1 and 2
 	bool FeetHanging;				//Daniel's super awesome feet hanging
 };
-
+struct CREATURE_INFO;
 struct LaraInfo
 {
 	short itemNumber;

TR5Main/Game/box.cpp

@@ -11,7 +11,7 @@
 #include "setup.h"
 #include "trmath.h"
 #include "objectslist.h"
-
+#include "creature.h"
 #define CHECK_CLICK(x) CLICK(x) / 2
 #define ESCAPE_DIST SECTOR(5)
 #define STALK_DIST SECTOR(3)

TR5Main/Game/control.cpp

@@ -52,7 +52,7 @@
 #include "prng.h"
 #include <Game/Lara/lara_one_gun.h>
 #include "generic_switch.h"
-
+#include "creature.h"
 using namespace TEN::Entities::Switches;
 
 using std::vector;

TR5Main/Game/door.cpp

@@ -21,7 +21,7 @@
 #include "generic_switch.h"
 #include "pickup.h"
 #include "fullblock_switch.h"
-
+#include "creature.h"
 using namespace TEN::Entities::Switches;
 
 PHD_VECTOR DoubleDoorPos(0, 0, 220);

TR5Main/Game/item.h

@@ -0,0 +1,57 @@
+#pragma once
+#include <cstdint>
+#include "phd_global.h"
+#include <string>
+enum GAME_OBJECT_ID : short;
+
+struct ROOM_VECTOR {
+	int roomNumber;
+	int yNumber;
+};
+struct ITEM_INFO {
+	int floor;
+	uint32_t touchBits;
+	uint32_t meshBits;
+	GAME_OBJECT_ID objectNumber;
+	short currentAnimState;
+	short goalAnimState;
+	short requiredAnimState;
+	short animNumber;
+	short frameNumber;
+	short roomNumber;
+	ROOM_VECTOR location;
+	short nextItem;
+	short nextActive;
+	short speed;
+	short fallspeed;
+	short hitPoints;
+	int boxNumber;
+	short timer;
+	uint16_t flags; // ItemFlags enum
+	short shade;
+	uint16_t triggerFlags;
+	short carriedItem;
+	short afterDeath;
+	short firedWeapon;
+	short itemFlags[8];
+	void* data;
+	PHD_3DPOS pos;
+	bool active;
+	short status; // ItemStatus enum
+	bool gravityStatus;
+	bool hitStatus;
+	bool collidable;
+	bool lookedAt;
+	bool dynamicLight;
+	bool poisoned;
+	uint8_t aiBits; // AIObjectType enum
+	bool reallyActive;
+	bool inDrawRoom;
+	bool friendly;
+	uint32_t swapMeshFlags;
+	short drawRoom;
+	short TOSSPAD;
+	PHD_3DPOS startPos;
+	short locationAI;
+	std::string luaName;
+};

TR5Main/Game/itemdata/creature.h

@@ -0,0 +1,75 @@
+#pragma once
+#include "phd_global.h"
+#include <vector>
+struct BOX_NODE {
+	int exitBox;
+	int searchNumber;
+	int nextExpansion;
+	int boxNumber;
+};
+
+enum ZoneType : char {
+	ZONE_NULL = -1,  // default zone
+	ZONE_SKELLY = 0,
+	ZONE_BASIC,
+	ZONE_FLYER,
+	ZONE_HUMAN_CLASSIC,
+	ZONE_VON_CROY,
+	ZONE_WATER,
+	ZONE_MAX,
+	/// custom zone (using zone above for LOT.zone):
+	ZONE_HUMAN_JUMP_AND_MONKEY,
+	ZONE_HUMAN_JUMP,
+	ZONE_SPIDER,
+	ZONE_BLOCKABLE, // for trex, shiva, etc..
+	ZONE_SOPHIALEE, // dont want sophia to go down again !
+	ZONE_APE,       // only 2 click climb
+	ZONE_HUMAN_LONGJUMP_AND_MONKEY,
+};
+
+struct LOT_INFO {
+	std::vector<BOX_NODE> node;
+	int head;
+	int tail;
+	int searchNumber;
+	int blockMask;
+	short step;
+	short drop;
+	short zoneCount;
+	int targetBox;
+	int requiredBox;
+	short fly;
+	bool canJump;
+	bool canMonkey;
+	bool isAmphibious;
+	bool isJumping;
+	bool isMonkeying;
+	PHD_VECTOR target;
+	ZoneType zone;
+};
+enum MOOD_TYPE {
+	BORED_MOOD,
+	ATTACK_MOOD,
+	ESCAPE_MOOD,
+	STALK_MOOD
+};
+struct CREATURE_INFO {
+	short jointRotation[4];
+	short maximumTurn;
+	short flags;
+	bool alerted;
+	bool headLeft;
+	bool headRight;
+	bool reachedGoal;
+	bool hurtByLara;
+	bool patrol2;
+	bool jumpAhead;
+	bool monkeyAhead;
+	MOOD_TYPE mood;
+	ITEM_INFO* enemy;
+	ITEM_INFO aiTarget;
+	short pad;
+	short itemNum;
+	PHD_VECTOR target;
+	LOT_INFO LOT;
+};

TR5Main/Game/itemdata/itemdata.h

@@ -0,0 +1,13 @@
+#pragma once
+#include <variant>
+#include <functional>
+#include <cstddef>
+struct ITEM_INFO;
+class ITEM_DATA {
+	std::variant<std::nullptr_t,int, short, ItemInfo*, AiInfo*> data;
+	public:
+	template<typename ... F>
+	void apply(F&&... funcs) {
+		std::visit(std::forward<F>(...funcs), data);
+	}
+};

TR5Main/Game/items.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "phd_global.h"
-
-enum GAME_OBJECT_ID : short;
+#include "item.h"
 
 enum AIObjectType
 {
@@ -32,60 +31,8 @@ enum ItemFlags
 	IFLAG_ACTIVATION_MASK = 0x3E00 // bits 9-13
 };
 
-struct ROOM_VECTOR
-{
-	int roomNumber;
-	int yNumber;
-};
 
-struct ITEM_INFO
-{
-	int floor;
-	DWORD touchBits;
-	DWORD meshBits;
-	GAME_OBJECT_ID objectNumber;
-	short currentAnimState;
-	short goalAnimState;
-	short requiredAnimState;
-	short animNumber;
-	short frameNumber;
-	short roomNumber;
-	ROOM_VECTOR location;
-	short nextItem;
-	short nextActive;
-	short speed;
-	short fallspeed;
-	short hitPoints;
-	int boxNumber;
-	short timer;
-	unsigned short flags; // ItemFlags enum
-	short shade;
-	short triggerFlags;
-	short carriedItem;
-	short afterDeath;
-	short firedWeapon;
-	short itemFlags[8];
-	void* data;
-	PHD_3DPOS pos;
-	bool active;
-	short status; // ItemStatus enum
-	bool gravityStatus;
-	bool hitStatus;
-	bool collidable;
-	bool lookedAt;
-	bool dynamicLight;
-	bool poisoned;
-	byte aiBits; // AIObjectType enum
-	bool reallyActive;
-	bool inDrawRoom;
-	bool friendly;
-	int swapMeshFlags;
-	short drawRoom;
-	short TOSSPAD;
-	PHD_3DPOS startPos;
-	short locationAI;
-	std::string luaName;
-};
+
 
 // used by fx->shade !
 #define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F)

TR5Main/Game/lot.cpp

@@ -5,7 +5,7 @@
 #include "camera.h"
 #include "lara.h"
 #include "level.h"
-
+#include "creature.h"
 #define DEFAULT_FLY_UPDOWN_SPEED 16
 #define DEFAULT_SWIM_UPDOWN_SPEED 32
 

TR5Main/Game/misc.cpp

@@ -4,6 +4,7 @@
 #include "level.h"
 #include "lara.h"
 #include "draw.h"
+#include "creature.h"
 using std::vector;
 short GF(short animIndex, short frameToStart)
 {

TR5Main/Game/people.cpp

@@ -8,7 +8,7 @@
 #include "debris.h"
 #include "lara.h"
 #include "sound.h"
-
+#include "creature.h"
 int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage) 
 {
 	CREATURE_INFO* creature = (CREATURE_INFO*)item->data;

TR5Main/Game/savegame.cpp

@@ -18,7 +18,7 @@
 #include "tr5_spider_emitter.h"
 #include "generic_switch.h"
 #include "fullblock_switch.h"
-
+#include "creature.h"
 using namespace TEN::Entities::Switches;
 
 using std::string;

TR5Main/Objects/TR1/Entity/tr1_ape.cpp

@@ -5,7 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
-
+#include "creature.h"
 BITE_INFO apeBite = { 0, -19, 75, 15 };
 
 #define ATTACK_DAMAGE 200

TR5Main/Objects/TR1/Entity/tr1_bear.cpp

@@ -5,7 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
-
+#include "creature.h"
 BITE_INFO bearBite = { 0, 96, 335, 14 };
 
 enum bearStates{

TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp

@@ -7,7 +7,7 @@
 #include "misc.h"
 #include "people.h"
 #include "setup.h"
-
+#include "creature.h"
 #define BIG_RAT_RUN_TURN ANGLE(6.0f)
 #define BIG_RAT_SWIM_TURN ANGLE(3.0f)
 

TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp

@@ -8,7 +8,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
-
+#include "creature.h"
 enum abortion_anims {
 	ABORT_EMPTY, ABORT_STOP, ABORT_TURNL, ABORT_TURNR, ABORT_ATTACK1, ABORT_ATTACK2,
 	ABORT_ATTACK3, ABORT_FORWARD, ABORT_SET, ABORT_FALL, ABORT_DEATH, ABORT_KILL

TR5Main/Objects/TR1/Entity/tr1_natla.cpp

@@ -9,7 +9,7 @@
 #include "effect2.h"
 #include "effect.h"
 #include "trmath.h"
-
+#include "creature.h"
 #define NATLA_NEAR_DEATH 200
 
 enum natla_anims {

TR5Main/Objects/TR1/Entity/tr1_wolf.cpp

@@ -6,7 +6,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO wolfBite = { 0, -14, 174, 6 };
 
 enum wolfStates {

TR5Main/Objects/TR1/tr1_objects.cpp

@@ -19,6 +19,7 @@
 #include "setup.h"
 #include "level.h"
 #include "object_helper.h"
+#include "creature.h"
 
 static void StartBaddy(OBJECT_INFO* obj)
 {

TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp

@@ -5,7 +5,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO barracudaBite = { 2, -60, 121, 7 };
 
 void BarracudaControl(short itemNum)

TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp

@@ -5,7 +5,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO birdyBiteL = { 0, 224, 0, 19 };
 BITE_INFO birdyBiteR = { 0, 224, 0, 22 };
 

TR5Main/Objects/TR2/Entity/tr2_dragon.cpp

@@ -12,7 +12,7 @@
 #include "setup.h"
 #include "input.h"
 #include "sound.h"
-
+#include "creature.h"
 
 #define DRAGON_SWIPE_DAMAGE 250
 #define DRAGON_TOUCH_DAMAGE 10

TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp

@@ -6,6 +6,7 @@
 #include "items.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO eagleBite = { 15, 46, 21, 6 };
 BITE_INFO crowBite = { 2, 10, 60, 14 };

TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp

@@ -8,7 +8,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
-
+#include "creature.h"
 BITE_INFO knifeLeft = { 0, 0, 0, 5 };
 BITE_INFO knifeRight = { 0, 0, 0, 8 };
 

TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp

@@ -6,7 +6,7 @@
 #include "level.h"
 #include "control.h"
 #include "trmath.h"
-
+#include "creature.h"
 BITE_INFO mercUziBite = { 0, 150, 19, 17 };
 BITE_INFO mercAutoPistolBite = { 0, 230, 9, 17 };
 

TR5Main/Objects/TR2/Entity/tr2_monk.cpp

@@ -6,7 +6,7 @@
 #include "sound.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO monkBite = { -23,16,265, 14 };
 
 extern bool MonksAttackLara;

TR5Main/Objects/TR2/Entity/tr2_rat.cpp

@@ -5,7 +5,7 @@
 #include "effect.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO ratBite = { 0, 0, 57, 2 };
 
 void RatControl(short itemNum)

TR5Main/Objects/TR2/Entity/tr2_shark.cpp

@@ -5,7 +5,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
-
+#include "creature.h"
 BITE_INFO sharkBite = { 17, -22, 344, 12 };
 
 void SharkControl(short itemNum)

TR5Main/Objects/TR2/Entity/tr2_silencer.cpp

@@ -5,7 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
-
+#include "creature.h"
 BITE_INFO silencerGun = { 3, 331, 56, 10 };
 
 void SilencerControl(short itemNum)

TR5Main/Objects/TR2/Entity/tr2_skidman.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "sound.h"
 #include "snowmobile.h"
+#include "creature.h"
 
 enum SKIDMAN_STATE { SMAN_EMPTY, SMAN_WAIT, SMAN_MOVING, SMAN_STARTLEFT, SMAN_STARTRIGHT, SMAN_LEFT, SMAN_RIGHT, SMAN_DEATH };
 

TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp

@@ -7,6 +7,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO spearLeftBite = { 0, 0, 920, 11 };
 BITE_INFO spearRightBite = { 0, 0, 920, 18 };

TR5Main/Objects/TR2/Entity/tr2_spider.cpp

@@ -10,6 +10,7 @@
 #include "setup.h"
 #include "tomb4fx.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO spiderBite = { 0, 0, 41, 1 };
 

TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp

@@ -9,6 +9,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO swordBite = { 0, 37, 550, 15 };
 

TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO workerDualGunL = { -2, 275, 23, 6 };
 BITE_INFO workerDualGunR = { 2, 275, 23, 10 };

TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "effect.h"
 #include "trmath.h"
+#include "creature.h"
 
 BITE_INFO workerFlameThrower = { 0, 250, 32, 9 };
 

TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp

@@ -6,6 +6,7 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
+#include "creature.h"
 
 BITE_INFO workerMachineGun = { 0, 308, 32, 9 };
 

TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp

@@ -6,6 +6,7 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
+#include "creature.h"
 
 BITE_INFO workerShotgun = { 0, 281, 40, 9 };
 

TR5Main/Objects/TR2/Entity/tr2_yeti.cpp

@@ -6,6 +6,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO yetiBiteR = { 12, 101, 19, 10 };
 BITE_INFO yetiBiteL = { 12, 101, 19, 13 };

TR5Main/Objects/TR2/tr2_objects.cpp

@@ -34,6 +34,7 @@
 #include "box.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 static void StartBaddy(OBJECT_INFO* obj)
 {

TR5Main/Objects/TR3/Entity/tr3_civvy.cpp

@@ -8,6 +8,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO civvy_hit = { 0,0,0, 13 };
 

TR5Main/Objects/TR3/Entity/tr3_cobra.cpp

@@ -6,6 +6,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO cobraBite = { 0, 0, 0, 13 };
 

TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp

@@ -12,6 +12,7 @@
 #include "lara.h"
 #include "sound.h"
 #include "effect.h"
+#include "creature.h"
 
 BITE_INFO flamerBite = { 0, 340, 64, 7 };
 

TR5Main/Objects/TR3/Entity/tr3_monkey.cpp

@@ -7,6 +7,8 @@
 #include "setup.h"
 #include "lot.h"
 #include "level.h"
+#include "creature.h"
+#include "creature.h"
 
 BITE_INFO monkeyBite = { 10, 10, 11, 13 };
 

TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp

@@ -10,6 +10,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 enum MPGUN_STATES
 {

TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp

@@ -9,6 +9,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO mpstickBite1 = { 247, 10, 11, 13 };
 BITE_INFO mpstickBite2 = { 0, 0, 100, 6 };

TR5Main/Objects/TR3/Entity/tr3_raptor.cpp

@@ -6,6 +6,7 @@
 #include "lot.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 static BITE_INFO raptorBite = { 0, 66, 318, 22 };
 

TR5Main/Objects/TR3/Entity/tr3_scuba.cpp

@@ -6,6 +6,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO scubaGun = { 17, 164, 44, 18 };
 

TR5Main/Objects/TR3/Entity/tr3_shiva.cpp

@@ -9,6 +9,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO shivaLeftBite = { 0, 0, 920, 13 };
 BITE_INFO shivaRightBite = { 0, 0, 920, 22 };

TR5Main/Objects/TR3/Entity/tr3_tiger.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO tigerBite = { 19, -13, 3, 26 };
 

TR5Main/Objects/TR3/Entity/tr3_tony.cpp

@@ -13,6 +13,7 @@
 #include "lara.h"
 #include "traps.h"
 #include "sound.h"
+#include "creature.h"
 
 enum TonyFlameType
 {

TR5Main/Objects/TR3/Entity/tr3_trex.cpp

@@ -6,6 +6,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 void LaraTyrannosaurDeath(ITEM_INFO* item)
 {

TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp

@@ -11,6 +11,7 @@
 #include "draw.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO tribesmanAxeBite = { 0, 16, 265, 13 };
 BITE_INFO tribesmanDartsBite1 = { 0, 0, -200, 13 };

TR5Main/Objects/TR3/tr3_objects.cpp

@@ -33,6 +33,7 @@
 #include "collide.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 static void StartBaddy(OBJECT_INFO* obj)
 {

TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp

@@ -13,6 +13,7 @@
 #include "people.h"
 #include "items.h"
 #include "lot.h"
+#include "creature.h"
 
 enum AHMET_STATE
 {

TR5Main/Objects/TR4/Entity/tr4_baboon.cpp

@@ -7,6 +7,8 @@
 #include "misc.h"
 #include "Lara.h"
 #include "tomb4fx.h"
+#include "creature.h"
+
 using std::vector;
 BaboonRespawnClass BaboonRespawn;
 static BITE_INFO baboonBite = { 10, 10, 11, 4 };

TR5Main/Objects/TR4/Entity/tr4_baddy.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include <draw.h>
 #include <Game/lot.h>
+#include "creature.h"
 
 /*
 ID_BADDY_1

TR5Main/Objects/TR4/Entity/tr4_bat.cpp

@@ -8,6 +8,7 @@
 #include "lot.h"
 #include "setup.h"
 #include "trmath.h"
+#include "creature.h"
 
 enum BAT_STATE
 {

TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp

@@ -10,7 +10,7 @@
 #include <sound.h>
 #include <sphere.h>
 #include <people.h>
-
+#include "creature.h"
 BITE_INFO BitBeetleBite = { 0,0,0,12 };
 
 void InitialiseBigBeetle(short itemNumber)

TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp

@@ -7,6 +7,7 @@
 #include "lot.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO scorpionBite1 = { 0, 0, 0, 8 };
 BITE_INFO scorpionBite2 = { 0, 0, 0, 23 };

TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp

@@ -9,6 +9,7 @@
 #include "lara.h"
 #include "draw.h"
 #include "misc.h"
+#include "creature.h"
 
 enum CROCODILE_STATE
 {

TR5Main/Objects/TR4/Entity/tr4_demigod.cpp

@@ -12,6 +12,7 @@
 #include "level.h"
 #include "lara.h"
 #include "effect.h"
+#include "creature.h"
 
 extern SMOKE_SPARKS SmokeSparks[MAX_SPARKS_SMOKE];
 

TR5Main/Objects/TR4/Entity/tr4_dog.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 static BYTE DogAnims[] = { 20, 21, 22, 20 };
 static BITE_INFO DogBite = { 0, 0, 100, 3 };

TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp

@@ -12,7 +12,7 @@
 #include <tomb4fx.h>
 #include <sound.h>
 #include <draw.h>
-
+#include "creature.h"
 void EnemyJeepLaunchGrenade(ITEM_INFO* item)
 {
 	short grenadeItemNumber = CreateItem();

TR5Main/Objects/TR4/Entity/tr4_guide.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 #define	STATE_GUIDE_STOP				1
 #define	STATE_GUIDE_WALK				2

TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp

@@ -9,6 +9,7 @@
 #include "lara.h"
 #include "draw.h"
 #include "misc.h"
+#include "creature.h"
 
 #define STATE_HAMMERHEAD_STOP       0
 #define STATE_HAMMERHEAD_SWIM_SLOW  1

TR5Main/Objects/TR4/Entity/tr4_harpy.cpp

@@ -11,6 +11,7 @@
 #include "lot.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO harpyBite1 = { 0, 0, 0, 4 };
 BITE_INFO harpyBite2 = { 0, 0, 0, 2 };

TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp

@@ -10,6 +10,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO knightTemplarBite = { 0, 0, 0, 11 };
 

TR5Main/Objects/TR4/Entity/tr4_mummy.cpp

@@ -7,6 +7,7 @@
 #include "effect.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 enum MUMMY_STATES {
 	STATE_MUMMY_ARMS_CROSSED = 0,

TR5Main/Objects/TR4/Entity/tr4_mutant.cpp

@@ -9,6 +9,7 @@
 #include "sphere.h"
 #include "objectslist.h"
 #include "trmath.h"
+#include "creature.h"
 
 namespace TEN::Entities::TR4
 {

TR5Main/Objects/TR4/Entity/tr4_sas.cpp

@@ -11,6 +11,7 @@
 #include <Specific\input.h>
 #include <Game/tomb4fx.h>
 #include <Game/Lara/lara_one_gun.h>
+#include "creature.h"
 
 enum SAS_STATES
 {

TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp

@@ -16,6 +16,7 @@
 #include "sound.h"
 #include "trmath.h"
 #include "objectslist.h"
+#include "creature.h"
 
 #ifndef NEW_INV
 extern Inventory g_Inventory;

TR5Main/Objects/TR4/Entity/tr4_setha.cpp

@@ -10,6 +10,7 @@
 #include <sound.h>
 #include <sphere.h>
 #include <people.h>
+#include "creature.h"
 
 BITE_INFO SethaBite1 = { 0,220,50,17 };
 BITE_INFO SethaBite2 = { 0,220,50,13 };

TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp

@@ -13,6 +13,7 @@
 #include "setup.h"
 #include "tomb4fx.h"
 #include "level.h"
+#include "creature.h"
 
 namespace TEN::Entities::TR4
 {

TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp

@@ -6,6 +6,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO smallScorpionBiteInfo1 = { 0, 0, 0, 0 };
 BITE_INFO smallScorpionBiteInfo2 = { 0, 0, 0, 23 };

TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp

@@ -8,6 +8,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 enum SPHIX_STATES {
 	SPHINX_EMPTY,

TR5Main/Objects/TR4/Entity/tr4_troops.cpp

@@ -9,6 +9,7 @@
 #include "setup.h"
 #include "lot.h"
 #include "level.h"
+#include "creature.h"
 
 BITE_INFO TroopsBite1 = { 0, 300, 64, 7 };
 

TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp

@@ -12,6 +12,7 @@
 #include "lara.h"
 #include "sound.h"
 #include <Game\draw.h>
+#include "creature.h"
 
 #define STATE_VON_CROY_STOP						1
 #define STATE_VON_CROY_WALK						2

TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp

@@ -7,6 +7,7 @@
 #include "lot.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO wildboardBiteInfo = { 0, 0, 0, 14 };
 

TR5Main/Objects/TR4/tr4_objects.cpp

@@ -69,6 +69,7 @@
 #include "setup.h"
 #include "level.h"
 #include "tr4_enemy_jeep.h"
+#include "creature.h"
 
 static void StartBaddy(OBJECT_INFO* obj)
 {

TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp

@@ -9,6 +9,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO BrownBeastBite1 = { 0, 0, 0, 16 };
 BITE_INFO BrownBeastBite2 = { 0, 0, 0, 22 };

TR5Main/Objects/TR5/Entity/tr5_chef.cpp

@@ -12,6 +12,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 #define STATE_CHEF_COOKING			1
 #define STATE_CHEF_TURN_180			2

TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp

@@ -12,6 +12,7 @@
 #include "setup.h"
 #include "level.h"
 #include "sound.h"
+#include "creature.h"
 
 #define STATE_HITMAN_STOP					1
 #define STATE_HITMAN_WALK					2

TR5Main/Objects/TR5/Entity/tr5_doberman.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO DobermanBite = { 0, 0x1E, 0x8D, 0x14 };
 

TR5Main/Objects/TR5/Entity/tr5_dog.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 static BYTE DogAnims[] = { 20, 21, 22, 20 };
 static BITE_INFO DogBite = { 0, 0, 100, 3 };

TR5Main/Objects/TR5/Entity/tr5_ghost.cpp

@@ -8,6 +8,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO InvisibleGhostBite = { 0, 0, 0, 17 };
 

TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO GladiatorBite = { 0, 0, 0, 16 };
 

TR5Main/Objects/TR5/Entity/tr5_guard.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 BITE_INFO SwatGun = { 80, 200, 13, 0 };
 BITE_INFO SniperGun = { 0, 480, 110, 13 };

TR5Main/Objects/TR5/Entity/tr5_hydra.cpp

@@ -11,6 +11,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 #define STATE_HYDRA_STOP			0
 #define STATE_HYDRA_BITE_ATTACK1	1

TR5Main/Objects/TR5/Entity/tr5_imp.cpp

@@ -9,6 +9,7 @@
 #include "box.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 #define STATE_IMP_WALK			0
 #define STATE_IMP_STOP			1

TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp

@@ -13,6 +13,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 #define STATE_LAGOON_WITCH_SWIM			1
 #define STATE_LAGOON_WITCH_STOP			2

TR5Main/Objects/TR5/Entity/tr5_larson.cpp

@@ -9,6 +9,7 @@
 #include "lara.h"
 #include "setup.h"
 #include "level.h"
+#include "creature.h"
 
 #define STATE_TR5_LARSON_STOP		1
 #define STATE_TR5_LARSON_WALK		2

TR5Main/Objects/TR5/Entity/tr5_lion.cpp

@@ -10,6 +10,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 BITE_INFO LionBite1 = { -2, -10, 250, 21 };
 BITE_INFO LionBite2 = { -2, -10, 132, 21 };

TR5Main/Objects/TR5/Entity/tr5_reaper.cpp

@@ -5,6 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "lara.h"
+#include "creature.h"
 
 void InitialiseReaper(short itemNum)
 {

TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp

@@ -14,6 +14,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 #define STATE_ROMAN_STATUE_STOP					1
 #define STATE_ROMAN_STATUE_SCREAMING			2

TR5Main/Objects/TR5/Entity/tr5_submarine.cpp

@@ -14,6 +14,7 @@
 #include "level.h"
 #include "lara.h"
 #include "sound.h"
+#include "creature.h"
 
 static void TriggerSubmarineSparks(short itemNumber)
 {

TR5Main/Objects/TR5/tr5_objects.cpp

@@ -67,6 +67,7 @@
 #include "level.h"
 /// register objects
 #include "object_helper.h"
+#include "creature.h"
 
 using namespace TEN::Entities::TR5;
 

TR5Main/Renderer/Render11Helper.cpp

@@ -17,6 +17,7 @@
 #include "jeep.h"
 #include "motorbike.h"
 #include <algorithm>
+#include "creature.h"
 
 extern GameConfiguration g_Configuration;
 extern GameFlow *g_GameFlow;

TR5Main/Specific/setup.cpp

@@ -33,6 +33,7 @@
 
 #include "generic_switch.h"
 #include "fullblock_switch.h"
+#include "creature.h"
 
 using namespace TEN::Entities::Switches;