From b23cfe231a7bf15503e6062ee4ecebc5312036ee Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 12:16:03 +0200 Subject: [PATCH] Fixed Include Hell for Creature Info --- TR5Main/Game/Box.h | 80 +------------------ TR5Main/Game/Lara/lara_fire.cpp | 2 +- TR5Main/Game/Lara/lara_struct.h | 2 +- TR5Main/Game/box.cpp | 2 +- TR5Main/Game/control.cpp | 2 +- TR5Main/Game/door.cpp | 2 +- TR5Main/Game/item.h | 57 +++++++++++++ TR5Main/Game/itemdata/creature.h | 75 +++++++++++++++++ TR5Main/Game/itemdata/itemdata.h | 13 +++ TR5Main/Game/items.h | 57 +------------ TR5Main/Game/lot.cpp | 2 +- TR5Main/Game/misc.cpp | 1 + TR5Main/Game/people.cpp | 2 +- TR5Main/Game/savegame.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_ape.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_bear.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp | 2 +- .../Objects/TR1/Entity/tr1_giant_mutant.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_natla.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_wolf.cpp | 2 +- TR5Main/Objects/TR1/tr1_objects.cpp | 1 + TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp | 2 +- .../Objects/TR2/Entity/tr2_birdmonster.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_dragon.cpp | 2 +- .../Objects/TR2/Entity/tr2_eagle_or_crow.cpp | 1 + .../Objects/TR2/Entity/tr2_knifethrower.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_monk.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_rat.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_shark.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_silencer.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_skidman.cpp | 1 + .../Objects/TR2/Entity/tr2_spear_guardian.cpp | 1 + TR5Main/Objects/TR2/Entity/tr2_spider.cpp | 1 + .../Objects/TR2/Entity/tr2_sword_guardian.cpp | 1 + .../TR2/Entity/tr2_worker_dualrevolver.cpp | 1 + .../TR2/Entity/tr2_worker_flamethrower.cpp | 1 + .../TR2/Entity/tr2_worker_machinegun.cpp | 1 + .../Objects/TR2/Entity/tr2_worker_shotgun.cpp | 1 + TR5Main/Objects/TR2/Entity/tr2_yeti.cpp | 1 + TR5Main/Objects/TR2/tr2_objects.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_civvy.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_cobra.cpp | 1 + .../Objects/TR3/Entity/tr3_flamethrower.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_monkey.cpp | 2 + TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_raptor.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_scuba.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_shiva.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_tiger.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_tony.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_trex.cpp | 1 + TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp | 1 + TR5Main/Objects/TR3/tr3_objects.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_baboon.cpp | 2 + TR5Main/Objects/TR4/Entity/tr4_baddy.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_bat.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp | 2 +- .../Objects/TR4/Entity/tr4_bigscorpion.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_demigod.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_dog.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_guide.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_harpy.cpp | 1 + .../Objects/TR4/Entity/tr4_knighttemplar.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_mummy.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_mutant.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_sas.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_setha.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp | 1 + .../Objects/TR4/Entity/tr4_smallscorpion.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_troops.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp | 1 + TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp | 1 + TR5Main/Objects/TR4/tr4_objects.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_chef.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_doberman.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_dog.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_ghost.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_guard.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_hydra.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_imp.cpp | 1 + .../Objects/TR5/Entity/tr5_lagoon_witch.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_larson.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_lion.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_reaper.cpp | 1 + .../Objects/TR5/Entity/tr5_roman_statue.cpp | 1 + TR5Main/Objects/TR5/Entity/tr5_submarine.cpp | 1 + TR5Main/Objects/TR5/tr5_objects.cpp | 1 + TR5Main/Renderer/Render11Helper.cpp | 1 + TR5Main/Specific/setup.cpp | 1 + TR5Main/Specific/setup.h | 2 +- TR5Main/TombEngine.vcxproj | 5 +- TR5Main/TombEngine.vcxproj.filters | 9 +++ 103 files changed, 262 insertions(+), 158 deletions(-) create mode 100644 TR5Main/Game/item.h create mode 100644 TR5Main/Game/itemdata/creature.h create mode 100644 TR5Main/Game/itemdata/itemdata.h diff --git a/TR5Main/Game/Box.h b/TR5Main/Game/Box.h index 17b1c7eec..3c97a9a0e 100644 --- a/TR5Main/Game/Box.h +++ b/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 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 { diff --git a/TR5Main/Game/Lara/lara_fire.cpp b/TR5Main/Game/Lara/lara_fire.cpp index 792aa53c5..c20582acb 100644 --- a/TR5Main/Game/Lara/lara_fire.cpp +++ b/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 */ diff --git a/TR5Main/Game/Lara/lara_struct.h b/TR5Main/Game/Lara/lara_struct.h index ca3c229b8..19700d3e5 100644 --- a/TR5Main/Game/Lara/lara_struct.h +++ b/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; diff --git a/TR5Main/Game/box.cpp b/TR5Main/Game/box.cpp index 03b007a0c..f0c639a30 100644 --- a/TR5Main/Game/box.cpp +++ b/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) diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp index 7baa9ca11..40b7fc11f 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control.cpp @@ -52,7 +52,7 @@ #include "prng.h" #include #include "generic_switch.h" - +#include "creature.h" using namespace TEN::Entities::Switches; using std::vector; diff --git a/TR5Main/Game/door.cpp b/TR5Main/Game/door.cpp index 582705b6f..bf6ff1370 100644 --- a/TR5Main/Game/door.cpp +++ b/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); diff --git a/TR5Main/Game/item.h b/TR5Main/Game/item.h new file mode 100644 index 000000000..cce7882e9 --- /dev/null +++ b/TR5Main/Game/item.h @@ -0,0 +1,57 @@ +#pragma once +#include +#include "phd_global.h" +#include +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; +}; \ No newline at end of file diff --git a/TR5Main/Game/itemdata/creature.h b/TR5Main/Game/itemdata/creature.h new file mode 100644 index 000000000..67cb0f892 --- /dev/null +++ b/TR5Main/Game/itemdata/creature.h @@ -0,0 +1,75 @@ +#pragma once +#include "phd_global.h" +#include +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 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; +}; \ No newline at end of file diff --git a/TR5Main/Game/itemdata/itemdata.h b/TR5Main/Game/itemdata/itemdata.h new file mode 100644 index 000000000..602f19a45 --- /dev/null +++ b/TR5Main/Game/itemdata/itemdata.h @@ -0,0 +1,13 @@ +#pragma once +#include +#include +#include +struct ITEM_INFO; +class ITEM_DATA { + std::variant data; + public: + template + void apply(F&&... funcs) { + std::visit(std::forward(...funcs), data); + } +}; diff --git a/TR5Main/Game/items.h b/TR5Main/Game/items.h index a8ac1b146..beb5a98c9 100644 --- a/TR5Main/Game/items.h +++ b/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) diff --git a/TR5Main/Game/lot.cpp b/TR5Main/Game/lot.cpp index 7f58f769f..0e895465c 100644 --- a/TR5Main/Game/lot.cpp +++ b/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 diff --git a/TR5Main/Game/misc.cpp b/TR5Main/Game/misc.cpp index e8fc614ad..8b8544e59 100644 --- a/TR5Main/Game/misc.cpp +++ b/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) { diff --git a/TR5Main/Game/people.cpp b/TR5Main/Game/people.cpp index 928188006..20d463863 100644 --- a/TR5Main/Game/people.cpp +++ b/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; diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index 67eecac3c..66e44f116 100644 --- a/TR5Main/Game/savegame.cpp +++ b/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; diff --git a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp index 1019dbada..f43e8b327 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp +++ b/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 diff --git a/TR5Main/Objects/TR1/Entity/tr1_bear.cpp b/TR5Main/Objects/TR1/Entity/tr1_bear.cpp index 6b01361b7..7b662b263 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bear.cpp +++ b/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{ diff --git a/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp b/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp index 873b78662..eeff9ae8b 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp +++ b/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) diff --git a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp index c7cf2f984..ed85018bf 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp +++ b/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 diff --git a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp index b924c085a..c839bad3e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp index 6d9b52915..2449ce98e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR1/tr1_objects.cpp b/TR5Main/Objects/TR1/tr1_objects.cpp index 6b5179338..c629bb7b7 100644 --- a/TR5Main/Objects/TR1/tr1_objects.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp index 344aa0a4d..97d9c3b2b 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp +++ b/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) diff --git a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp b/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp index 45b82a3e5..790561581 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp index 344cc1554..3007c2e29 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp +++ b/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 diff --git a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp index 4a203ab81..38a6cc2f1 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp index 7033a1d02..4e1d63f2e 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp index 8e84773ca..b951f3423 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp index 55f87326e..cd1b2eca2 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp +++ b/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; diff --git a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp b/TR5Main/Objects/TR2/Entity/tr2_rat.cpp index 5e30f2268..83315e391 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp +++ b/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) diff --git a/TR5Main/Objects/TR2/Entity/tr2_shark.cpp b/TR5Main/Objects/TR2/Entity/tr2_shark.cpp index 29cdabfd9..4b913461a 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_shark.cpp +++ b/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) diff --git a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp b/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp index 60199758e..645a113dc 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp +++ b/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) diff --git a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp index 1a422c2e6..87ad90fe2 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp index 82119d779..f9e8645e7 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp b/TR5Main/Objects/TR2/Entity/tr2_spider.cpp index 8f81e6bae..4c0c39968 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp index b7f34fe4f..4044578f0 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp index ce7e60b97..75bae4203 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp index 1c1ce8964..543f003b8 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp index 6edec8f66..ffc694807 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp index 0e9bba209..a257a844f 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp index 9309a3a24..eb5259766 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR2/tr2_objects.cpp b/TR5Main/Objects/TR2/tr2_objects.cpp index d02b0a7e5..9fee6d6f2 100644 --- a/TR5Main/Objects/TR2/tr2_objects.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp index 2d9b3a35e..a106d7c40 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp index 5df23371f..83bcdedbc 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp index 26113d52a..2a87a4f3c 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp index f27b043e7..88b8fbea1 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp index b3713d52c..e888808a0 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp index f5e7fe7bc..6599f3182 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp b/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp index 3f2d7a09a..5ecfb4332 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp index aa9b76b13..39e953408 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index 53ed56e61..7079f1d32 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp index 6c9c43748..b7619bd96 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp index 89d0735cb..bacba737e 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp index 96c94063c..9f1c3276b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp index 8c9a5b361..ffb3da29b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR3/tr3_objects.cpp b/TR5Main/Objects/TR3/tr3_objects.cpp index 28eb0e404..e61027459 100644 --- a/TR5Main/Objects/TR3/tr3_objects.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp index 2c4ce8efc..df0bb4e1b 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp index cc605ad72..5113bf2c2 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp index c31c77708..088dd50c5 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp @@ -11,6 +11,7 @@ #include "level.h" #include #include +#include "creature.h" /* ID_BADDY_1 diff --git a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp index cfea37ef3..8543fbb6d 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp index b8e38d304..d7958d0b1 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp @@ -10,7 +10,7 @@ #include #include #include - +#include "creature.h" BITE_INFO BitBeetleBite = { 0,0,0,12 }; void InitialiseBigBeetle(short itemNumber) diff --git a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp index 933f1cac0..6884b9353 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp index 77df24059..aef3fae70 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp index ad1dede93..abb9bc9d2 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp +++ b/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]; diff --git a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp index f07b0eef7..929c92c9f 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp index a38139372..282696824 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp @@ -12,7 +12,7 @@ #include #include #include - +#include "creature.h" void EnemyJeepLaunchGrenade(ITEM_INFO* item) { short grenadeItemNumber = CreateItem(); diff --git a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp index 9f3dab4df..f3d6e6a09 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp +++ b/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 diff --git a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp index a7f7508eb..1209e1614 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp +++ b/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 diff --git a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp index 7c4c9278e..8350d8413 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp index 99735331e..1a33dd6bd 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp index 1d6b211c0..85696e6a5 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp +++ b/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, diff --git a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp index 421ac61c8..fdc46ac3e 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp index a7ad71092..ff36a675b 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp @@ -11,6 +11,7 @@ #include #include #include +#include "creature.h" enum SAS_STATES { diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp index 3a31498d4..299917046 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp +++ b/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; diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp index d7be36252..2a2c1fd3a 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp @@ -10,6 +10,7 @@ #include #include #include +#include "creature.h" BITE_INFO SethaBite1 = { 0,220,50,17 }; BITE_INFO SethaBite2 = { 0,220,50,13 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp index f7030cd4c..13625e09d 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp +++ b/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 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp index 37da69879..6f2bd46df 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp index dea0fc346..2f6489ae1 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp +++ b/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, diff --git a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp index 3b27cf790..cfa67b250 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp index 1a59a3775..ad292e70e 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp @@ -12,6 +12,7 @@ #include "lara.h" #include "sound.h" #include +#include "creature.h" #define STATE_VON_CROY_STOP 1 #define STATE_VON_CROY_WALK 2 diff --git a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp index 62b61ae8f..3f19de7f4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR4/tr4_objects.cpp b/TR5Main/Objects/TR4/tr4_objects.cpp index 7e685e26d..02b8c825f 100644 --- a/TR5Main/Objects/TR4/tr4_objects.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp index 524fe8733..6343581df 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp index 06c808c40..f4f2f897f 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp index 739bcdb12..ced7815c3 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp b/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp index b445f7a3d..5eac941f7 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp b/TR5Main/Objects/TR5/Entity/tr5_dog.cpp index b1f23d422..9c3bdd97f 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp index 683a4f714..7adfebffe 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp index 148ab373f..e48ed6a3e 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp index 51a3893d3..897a3db9b 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp index 069d83288..04c982ba2 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp index 6a6af1fd2..b3eaa0444 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp b/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp index cc2672bc9..4d4274dba 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp b/TR5Main/Objects/TR5/Entity/tr5_larson.cpp index 413e4d2d8..17016c2e6 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp index 2c90bc9b5..5659425b4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp +++ b/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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp b/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp index 88a608f14..c83c9b5cf 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp index a8b3413d5..48a18bfd4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp +++ b/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 diff --git a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp index 27bcaa2f1..4377e1e9e 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp +++ b/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) { diff --git a/TR5Main/Objects/TR5/tr5_objects.cpp b/TR5Main/Objects/TR5/tr5_objects.cpp index d86802341..0b86f7f0d 100644 --- a/TR5Main/Objects/TR5/tr5_objects.cpp +++ b/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; diff --git a/TR5Main/Renderer/Render11Helper.cpp b/TR5Main/Renderer/Render11Helper.cpp index 1a813c15c..60b2ab57e 100644 --- a/TR5Main/Renderer/Render11Helper.cpp +++ b/TR5Main/Renderer/Render11Helper.cpp @@ -17,6 +17,7 @@ #include "jeep.h" #include "motorbike.h" #include +#include "creature.h" extern GameConfiguration g_Configuration; extern GameFlow *g_GameFlow; diff --git a/TR5Main/Specific/setup.cpp b/TR5Main/Specific/setup.cpp index 1072917b0..c63e97715 100644 --- a/TR5Main/Specific/setup.cpp +++ b/TR5Main/Specific/setup.cpp @@ -33,6 +33,7 @@ #include "generic_switch.h" #include "fullblock_switch.h" +#include "creature.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Specific/setup.h b/TR5Main/Specific/setup.h index 4077dc335..68e616682 100644 --- a/TR5Main/Specific/setup.h +++ b/TR5Main/Specific/setup.h @@ -2,7 +2,7 @@ #include "box.h" #include "collide.h" #include "objectslist.h" - +enum ZoneType : char; enum HitEffectEnum { HIT_NONE, diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj index ac808eb6f..42c00af44 100644 --- a/TR5Main/TombEngine.vcxproj +++ b/TR5Main/TombEngine.vcxproj @@ -66,7 +66,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;TR5MAIN_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;NEW_INV;%(PreprocessorDefinitions) false - $(SolutionDir)TR5Main;$(SolutionDir)TR5Main\Game;$(SolutionDir)TR5Main\Game\Lara;$(SolutionDir)TR5Main\Objects;$(SolutionDir)TR5Main\Objects\Utils;$(SolutionDir)TR5Main\Objects\Effects;$(SolutionDir)TR5Main\Objects\Generic;$(SolutionDir)TR5Main\Objects\Generic\Switches;$(SolutionDir)TR5Main\Objects\Generic\Object;$(SolutionDir)TR5Main\Objects\TR1;$(SolutionDir)TR5Main\Objects\TR1\Entity;$(SolutionDir)TR5Main\Objects\TR1\Trap;$(SolutionDir)TR5Main\Objects\TR2;$(SolutionDir)TR5Main\Objects\TR2\Entity;$(SolutionDir)TR5Main\Objects\TR2\Trap;$(SolutionDir)TR5Main\Objects\TR2\Vehicles;$(SolutionDir)TR5Main\Objects\TR3;$(SolutionDir)TR5Main\Objects\TR3\Entity;$(SolutionDir)TR5Main\Objects\TR3\Trap;$(SolutionDir)TR5Main\Objects\TR3\Vehicles;$(SolutionDir)TR5Main\Objects\TR4;$(SolutionDir)TR5Main\Objects\TR4\Entity;$(SolutionDir)TR5Main\Objects\TR4\Trap;$(SolutionDir)TR5Main\Objects\TR4\Object;$(SolutionDir)TR5Main\Objects\TR4\Floor;$(SolutionDir)TR5Main\Objects\TR4\Switch;$(SolutionDir)TR5Main\Objects\TR4\Vehicles;$(SolutionDir)TR5Main\Objects\TR5;$(SolutionDir)TR5Main\Objects\TR5\Entity;$(SolutionDir)TR5Main\Objects\TR5\Trap;$(SolutionDir)TR5Main\Objects\TR5\Light;$(SolutionDir)TR5Main\Objects\TR5\Emitter;$(SolutionDir)TR5Main\Objects\TR5\Shatter;$(SolutionDir)TR5Main\Objects\TR5\Switch;$(SolutionDir)TR5Main\Objects\TR5\Object;$(SolutionDir)TR5Main\Objects\Generic\Switches;$(SolutionDir)TR5Main\Objects\Vehicles;$(SolutionDir)TR5Main\Renderer;$(SolutionDir)TR5Main\Scripting;$(SolutionDir)TR5Main\Specific;$(SolutionDir)TR5Main\Specific\IO;%(AdditionalIncludeDirectories) + $(SolutionDir)TR5Main\Game\itemdata;$(SolutionDir)TR5Main;$(SolutionDir)TR5Main\Game;$(SolutionDir)TR5Main\Game\Lara;$(SolutionDir)TR5Main\Objects;$(SolutionDir)TR5Main\Objects\Utils;$(SolutionDir)TR5Main\Objects\Effects;$(SolutionDir)TR5Main\Objects\Generic;$(SolutionDir)TR5Main\Objects\Generic\Switches;$(SolutionDir)TR5Main\Objects\Generic\Object;$(SolutionDir)TR5Main\Objects\TR1;$(SolutionDir)TR5Main\Objects\TR1\Entity;$(SolutionDir)TR5Main\Objects\TR1\Trap;$(SolutionDir)TR5Main\Objects\TR2;$(SolutionDir)TR5Main\Objects\TR2\Entity;$(SolutionDir)TR5Main\Objects\TR2\Trap;$(SolutionDir)TR5Main\Objects\TR2\Vehicles;$(SolutionDir)TR5Main\Objects\TR3;$(SolutionDir)TR5Main\Objects\TR3\Entity;$(SolutionDir)TR5Main\Objects\TR3\Trap;$(SolutionDir)TR5Main\Objects\TR3\Vehicles;$(SolutionDir)TR5Main\Objects\TR4;$(SolutionDir)TR5Main\Objects\TR4\Entity;$(SolutionDir)TR5Main\Objects\TR4\Trap;$(SolutionDir)TR5Main\Objects\TR4\Object;$(SolutionDir)TR5Main\Objects\TR4\Floor;$(SolutionDir)TR5Main\Objects\TR4\Switch;$(SolutionDir)TR5Main\Objects\TR4\Vehicles;$(SolutionDir)TR5Main\Objects\TR5;$(SolutionDir)TR5Main\Objects\TR5\Entity;$(SolutionDir)TR5Main\Objects\TR5\Trap;$(SolutionDir)TR5Main\Objects\TR5\Light;$(SolutionDir)TR5Main\Objects\TR5\Emitter;$(SolutionDir)TR5Main\Objects\TR5\Shatter;$(SolutionDir)TR5Main\Objects\TR5\Switch;$(SolutionDir)TR5Main\Objects\TR5\Object;$(SolutionDir)TR5Main\Objects\Vehicles;$(SolutionDir)TR5Main\Renderer;$(SolutionDir)TR5Main\Scripting;$(SolutionDir)TR5Main\Specific;$(SolutionDir)TR5Main\Specific\IO;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL false true @@ -144,6 +144,9 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" + + + diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters index b359c9773..455e95139 100644 --- a/TR5Main/TombEngine.vcxproj.filters +++ b/TR5Main/TombEngine.vcxproj.filters @@ -1080,6 +1080,15 @@ File di intestazione + + File di intestazione + + + File di intestazione + + + File di intestazione +