diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp index fc687ad93..f2758ecbe 100644 --- a/TR5Main/Game/Lara/lara.cpp +++ b/TR5Main/Game/Lara/lara.cpp @@ -39,7 +39,7 @@ #include "control\volume.h" #include "Renderer11.h" #include "camera.h" - +#include "item.h" #ifdef NEW_INV #include "newinv2.h" #else diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index aa5f331dd..60527fdda 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -14,7 +14,7 @@ #include "collide.h" #include "items.h" #include "camera.h" - +#include "item.h" /*generic functions*/ void lara_void_func(ITEM_INFO* item, COLL_INFO* coll) { diff --git a/TR5Main/Game/Lara/lara_cheat.cpp b/TR5Main/Game/Lara/lara_cheat.cpp index 40fae3ea3..efccb3c6a 100644 --- a/TR5Main/Game/Lara/lara_cheat.cpp +++ b/TR5Main/Game/Lara/lara_cheat.cpp @@ -12,7 +12,7 @@ #include "items.h" #include "setup.h" #include "level.h" - +#include "item.h" int NoCheatCounter; void lara_as_swimcheat(ITEM_INFO* item, COLL_INFO* coll) diff --git a/TR5Main/Game/Lara/lara_climb.cpp b/TR5Main/Game/Lara/lara_climb.cpp index 2d65957e0..1053357a9 100644 --- a/TR5Main/Game/Lara/lara_climb.cpp +++ b/TR5Main/Game/Lara/lara_climb.cpp @@ -7,7 +7,7 @@ #include "camera.h" #include "level.h" #include "input.h" - +#include "item.h" CLIMB_DIRECTION LeftIntRightExtTab[4] = { CLIMB_DIRECTION::West, CLIMB_DIRECTION::North, CLIMB_DIRECTION::East, CLIMB_DIRECTION::South diff --git a/TR5Main/Game/Lara/lara_collide.cpp b/TR5Main/Game/Lara/lara_collide.cpp index aa1ce0144..2656a81e7 100644 --- a/TR5Main/Game/Lara/lara_collide.cpp +++ b/TR5Main/Game/Lara/lara_collide.cpp @@ -7,7 +7,7 @@ #include "collide.h" #include "control/control.h" #include "lara_collide.h" - +#include "item.h" /*this file has all the generic **collision** test functions called in lara's state code*/ int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll) diff --git a/TR5Main/Game/Lara/lara_crawl.cpp b/TR5Main/Game/Lara/lara_crawl.cpp index 528e2f02d..532b30c0f 100644 --- a/TR5Main/Game/Lara/lara_crawl.cpp +++ b/TR5Main/Game/Lara/lara_crawl.cpp @@ -11,7 +11,7 @@ #include "items.h" #include "camera.h" #include "control/control.h" - +#include "item.h" /*this file has all the related functions to ducking and crawling*/ /*crouch/duck start*/ diff --git a/TR5Main/Game/Lara/lara_fire.cpp b/TR5Main/Game/Lara/lara_fire.cpp index 301b1d9ee..944e64775 100644 --- a/TR5Main/Game/Lara/lara_fire.cpp +++ b/TR5Main/Game/Lara/lara_fire.cpp @@ -20,7 +20,7 @@ #include "GameFlowScript.h" #include "lara_struct.h" #include "itemdata/creature_info.h" - +#include "item.h" WEAPON_INFO Weapons[NUM_WEAPONS] = { /* No weapons */ diff --git a/TR5Main/Game/Lara/lara_flare.cpp b/TR5Main/Game/Lara/lara_flare.cpp index 8382c4b6b..0377b70a7 100644 --- a/TR5Main/Game/Lara/lara_flare.cpp +++ b/TR5Main/Game/Lara/lara_flare.cpp @@ -12,7 +12,7 @@ #include "effects\effects.h" #include "effects\chaffFX.h" #include "Specific\prng.h" - +#include "item.h" constexpr std::array FlareFlickerTable = { 0.7590,0.9880,0.8790,0.920,0.8020,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.84642,0.7896,0.817634,0.923424,0.7589,0.81399,0.92834,0.9978,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.74642 }; constexpr DirectX::SimpleMath::Vector3 FlareMainColor = Vector3(1,0.52947, 0.3921); constexpr std::array FlareFlickerTableLow = { 0.7590,0.1880,0.0790,0.920,0.8020,0.07610,0.197878,0.38978,0.09983,0.00934763,0.8485,0.0762573,0.84642,0.7896,0.517634,0.0923424,0.7589,0.081399,0.92834,0.01978,0.17610,0.497878,0.8978,0.69983,0.934763,0.28485,0.1762573,0.374642 }; diff --git a/TR5Main/Game/Lara/lara_hang.cpp b/TR5Main/Game/Lara/lara_hang.cpp index 66daa76e8..02bc62013 100644 --- a/TR5Main/Game/Lara/lara_hang.cpp +++ b/TR5Main/Game/Lara/lara_hang.cpp @@ -6,7 +6,7 @@ #include "collide.h" #include "camera.h" #include "level.h" - +#include "item.h" /*this file has all the lara_as/lara_col functions related to hanging*/ /*normal hanging and shimmying*/ diff --git a/TR5Main/Game/Lara/lara_initialise.cpp b/TR5Main/Game/Lara/lara_initialise.cpp index 8be932438..713fca22a 100644 --- a/TR5Main/Game/Lara/lara_initialise.cpp +++ b/TR5Main/Game/Lara/lara_initialise.cpp @@ -5,7 +5,7 @@ #include "items.h" #include "setup.h" #include "level.h" - +#include "item.h" void InitialiseLara(int restore) { if (Lara.itemNumber == NO_ITEM) diff --git a/TR5Main/Game/Lara/lara_monkey.cpp b/TR5Main/Game/Lara/lara_monkey.cpp index 1da39c083..8525819c7 100644 --- a/TR5Main/Game/Lara/lara_monkey.cpp +++ b/TR5Main/Game/Lara/lara_monkey.cpp @@ -11,7 +11,7 @@ #include "camera.h" #include "control/control.h" #include "level.h" - +#include "item.h" using namespace TEN::Floordata; /*this file has all the related functions to monkeyswinging*/ diff --git a/TR5Main/Game/Lara/lara_objects.cpp b/TR5Main/Game/Lara/lara_objects.cpp index 240a51544..cfdfe04aa 100644 --- a/TR5Main/Game/Lara/lara_objects.cpp +++ b/TR5Main/Game/Lara/lara_objects.cpp @@ -9,7 +9,7 @@ #include "collide.h" #include "items.h" #include "control/control.h" - +#include "item.h" /*This file has "all" lara_as/lara_col functions where Lara is interacting with an object.*/ /*pickups*/ diff --git a/TR5Main/Game/Lara/lara_one_gun.cpp b/TR5Main/Game/Lara/lara_one_gun.cpp index a8da29bb7..2647aa17a 100644 --- a/TR5Main/Game/Lara/lara_one_gun.cpp +++ b/TR5Main/Game/Lara/lara_one_gun.cpp @@ -27,7 +27,7 @@ #include "effects\bubble.h" #include "generic_switch.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Entities::Switches; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Game/Lara/lara_slide.cpp b/TR5Main/Game/Lara/lara_slide.cpp index b1ef9ea5b..1b156f87a 100644 --- a/TR5Main/Game/Lara/lara_slide.cpp +++ b/TR5Main/Game/Lara/lara_slide.cpp @@ -7,7 +7,7 @@ #include "collide.h" #include "camera.h" #include "level.h" - +#include "item.h" /*this file has all the related functions to sliding*/ void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll) diff --git a/TR5Main/Game/Lara/lara_surface.cpp b/TR5Main/Game/Lara/lara_surface.cpp index c59eff721..21d6441ce 100644 --- a/TR5Main/Game/Lara/lara_surface.cpp +++ b/TR5Main/Game/Lara/lara_surface.cpp @@ -11,7 +11,7 @@ #include "lara_fire.h" #include "level.h" #include "input.h" - +#include "item.h" bool EnableCrawlFlexWaterPullUp, EnableCrawlFlexSubmerged; void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll) diff --git a/TR5Main/Game/Lara/lara_swim.cpp b/TR5Main/Game/Lara/lara_swim.cpp index 5165b4348..7d8bd663f 100644 --- a/TR5Main/Game/Lara/lara_swim.cpp +++ b/TR5Main/Game/Lara/lara_swim.cpp @@ -14,7 +14,7 @@ #include "input.h" #include "Sound\sound.h" #include "GameFlowScript.h" - +#include "item.h" struct SUBSUIT_INFO { short XRot; diff --git a/TR5Main/Game/Lara/lara_tests.cpp b/TR5Main/Game/Lara/lara_tests.cpp index e61866227..4656f5ca0 100644 --- a/TR5Main/Game/Lara/lara_tests.cpp +++ b/TR5Main/Game/Lara/lara_tests.cpp @@ -8,7 +8,7 @@ #include "lara_collide.h" #include "control/control.h" #include "control\los.h" - +#include "item.h" using namespace TEN::Floordata; static short LeftClimbTab[4] = // offset 0xA0638 diff --git a/TR5Main/Game/Lara/lara_two_guns.cpp b/TR5Main/Game/Lara/lara_two_guns.cpp index 0452be3bb..b7f9e4687 100644 --- a/TR5Main/Game/Lara/lara_two_guns.cpp +++ b/TR5Main/Game/Lara/lara_two_guns.cpp @@ -12,6 +12,7 @@ #include "Sound\sound.h" #include "savegame.h" #include "Specific\prng.h" +#include "item.h" using namespace TEN::Math::Random; struct PISTOL_DEF { diff --git a/TR5Main/Game/animation.cpp b/TR5Main/Game/animation.cpp index 950983aeb..aef248021 100644 --- a/TR5Main/Game/animation.cpp +++ b/TR5Main/Game/animation.cpp @@ -6,7 +6,7 @@ #include "Renderer11.h" #include "Sound/sound.h" #include "flipeffect.h" - +#include "item.h" using TEN::Renderer::g_Renderer; BOUNDING_BOX InterpolatedBounds; diff --git a/TR5Main/Game/camera.cpp b/TR5Main/Game/camera.cpp index e1387f487..85336f197 100644 --- a/TR5Main/Game/camera.cpp +++ b/TR5Main/Game/camera.cpp @@ -15,7 +15,7 @@ #include "control\los.h" #include "savegame.h" #include "input.h" - +#include "item.h" using TEN::Renderer::g_Renderer; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp index 3c94919d4..108b4c9f6 100644 --- a/TR5Main/Game/collide.cpp +++ b/TR5Main/Game/collide.cpp @@ -14,7 +14,7 @@ #include "Specific\prng.h" #include "room.h" #include "Renderer11.h" - +#include "item.h" using std::vector; using namespace TEN::Math::Random; using namespace TEN::Floordata; diff --git a/TR5Main/Game/control/box.cpp b/TR5Main/Game/control/box.cpp index 64f071356..ba3152f27 100644 --- a/TR5Main/Game/control/box.cpp +++ b/TR5Main/Game/control/box.cpp @@ -12,7 +12,7 @@ #include "Specific/trmath.h" #include "objectslist.h" #include "itemdata/creature_info.h" - +#include "item.h" #define CHECK_CLICK(x) CLICK(x) / 2 #define ESCAPE_DIST SECTOR(5) #define STALK_DIST SECTOR(3) diff --git a/TR5Main/Game/control/control.cpp b/TR5Main/Game/control/control.cpp index 530dff687..5682d2333 100644 --- a/TR5Main/Game/control/control.cpp +++ b/TR5Main/Game/control/control.cpp @@ -47,7 +47,7 @@ #include "generic_switch.h" #include "Scripting/GameFlowScript.h" #include - +#include "item.h" using std::vector; using std::unordered_map; using std::string; diff --git a/TR5Main/Game/control/los.cpp b/TR5Main/Game/control/los.cpp index d3937b468..354605ff2 100644 --- a/TR5Main/Game/control/los.cpp +++ b/TR5Main/Game/control/los.cpp @@ -9,7 +9,7 @@ #include "effects/tomb4fx.h" #include "effects/debris.h" #include "Lara/lara_one_gun.h" - +#include "item.h" int NumberLosRooms; short LosRooms[20]; int ClosestItem; diff --git a/TR5Main/Game/control/lot.cpp b/TR5Main/Game/control/lot.cpp index 18ffa8a86..8fea84df6 100644 --- a/TR5Main/Game/control/lot.cpp +++ b/TR5Main/Game/control/lot.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "level.h" #include "itemdata/creature_info.h" - +#include "item.h" #define DEFAULT_FLY_UPDOWN_SPEED 16 #define DEFAULT_SWIM_UPDOWN_SPEED 32 diff --git a/TR5Main/Game/control/trigger.cpp b/TR5Main/Game/control/trigger.cpp index 5a66f8a3b..80300191a 100644 --- a/TR5Main/Game/control/trigger.cpp +++ b/TR5Main/Game/control/trigger.cpp @@ -16,6 +16,7 @@ #include "Lara\lara_climb.h" #include "Objects\Generic\Switches\generic_switch.h" #include "Game/effects/lara_burn.h" +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Entities::Switches; diff --git a/TR5Main/Game/control/volume.cpp b/TR5Main/Game/control/volume.cpp index 20a63001f..3446674f5 100644 --- a/TR5Main/Game/control/volume.cpp +++ b/TR5Main/Game/control/volume.cpp @@ -7,6 +7,7 @@ #include "savegame.h" #include "RenderEnums.h" #include "Renderer11.h" +#include "item.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/effects/chaffFX.cpp b/TR5Main/Game/effects/chaffFX.cpp index 9c8c7b2e9..0a16faca8 100644 --- a/TR5Main/Game/effects/chaffFX.cpp +++ b/TR5Main/Game/effects/chaffFX.cpp @@ -9,6 +9,7 @@ #include "smoke.h" #include "spark.h" #include "Specific\prng.h" +#include "item.h" #define MAX_TRIGGER_RANGE 0x4000 using namespace TEN::Math::Random; diff --git a/TR5Main/Game/effects/effects.cpp b/TR5Main/Game/effects/effects.cpp index f620f424e..550cd619d 100644 --- a/TR5Main/Game/effects/effects.cpp +++ b/TR5Main/Game/effects/effects.cpp @@ -19,7 +19,7 @@ #include "Specific\prng.h" #include "Renderer11.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using TEN::Renderer::g_Renderer; using TEN::Effects::Explosion::TriggerExplosion; diff --git a/TR5Main/Game/effects/flmtorch.cpp b/TR5Main/Game/effects/flmtorch.cpp index d672daa80..bb741633f 100644 --- a/TR5Main/Game/effects/flmtorch.cpp +++ b/TR5Main/Game/effects/flmtorch.cpp @@ -10,7 +10,7 @@ #include "input.h" #include "Sound/sound.h" #include "Objects/Effects/flame_emitters.h" - +#include "item.h" using namespace TEN::Entities::Effects; void TriggerTorchFlame(char fxObj, char node) diff --git a/TR5Main/Game/effects/footprint.cpp b/TR5Main/Game/effects/footprint.cpp index 223fe5e25..6f5925494 100644 --- a/TR5Main/Game/effects/footprint.cpp +++ b/TR5Main/Game/effects/footprint.cpp @@ -6,7 +6,7 @@ #include "effects\footprint.h" #include "level.h" #include "items.h" - +#include "item.h" namespace TEN { namespace Effects { namespace Footprints { diff --git a/TR5Main/Game/effects/hair.cpp b/TR5Main/Game/effects/hair.cpp index 5d571f8f9..c8b44d711 100644 --- a/TR5Main/Game/effects/hair.cpp +++ b/TR5Main/Game/effects/hair.cpp @@ -10,7 +10,7 @@ #include "level.h" #include "effects\weather.h" #include "Renderer11.h" - +#include "item.h" using namespace TEN::Effects::Environment; using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/effects/lara_burn.cpp b/TR5Main/Game/effects/lara_burn.cpp index aa3877a99..2d34c0e82 100644 --- a/TR5Main/Game/effects/lara_burn.cpp +++ b/TR5Main/Game/effects/lara_burn.cpp @@ -5,7 +5,7 @@ #include "Game/effects/lara_burn.h" #include "Game/items.h" #include "Game/control/control.h" - +#include "item.h" namespace TEN::Effects::Fire { void LaraBurn() diff --git a/TR5Main/Game/effects/smoke.cpp b/TR5Main/Game/effects/smoke.cpp index 90d5bfcfb..470cbb179 100644 --- a/TR5Main/Game/effects/smoke.cpp +++ b/TR5Main/Game/effects/smoke.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "Specific\prng.h" #include "effects\weather.h" - +#include "item.h" using namespace TEN::Effects::Environment; using namespace TEN::Math::Random; diff --git a/TR5Main/Game/effects/tomb4fx.cpp b/TR5Main/Game/effects/tomb4fx.cpp index dbe2f10d0..f3c3611ab 100644 --- a/TR5Main/Game/effects/tomb4fx.cpp +++ b/TR5Main/Game/effects/tomb4fx.cpp @@ -17,7 +17,7 @@ #include "effects/effects.h" #include "effects/weather.h" #include "animation.h" - +#include "item.h" using std::vector; using TEN::Renderer::g_Renderer; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Game/flipeffect.cpp b/TR5Main/Game/flipeffect.cpp index 01dc5d95d..fb2bdfbfe 100644 --- a/TR5Main/Game/flipeffect.cpp +++ b/TR5Main/Game/flipeffect.cpp @@ -24,7 +24,7 @@ #include "effects\footprint.h" #include "effects\groundfx.h" #include "effects\debris.h" - +#include "item.h" using std::function; using namespace TEN::Effects::Footprints; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Game/floordata.cpp b/TR5Main/Game/floordata.cpp index dd819194d..1c8e50567 100644 --- a/TR5Main/Game/floordata.cpp +++ b/TR5Main/Game/floordata.cpp @@ -4,7 +4,7 @@ #include "room.h" #include "level.h" #include "setup.h" - +#include "item.h" using namespace TEN::Floordata; int FLOOR_INFO::SectorPlane(int x, int z) const diff --git a/TR5Main/Game/health.cpp b/TR5Main/Game/health.cpp index 778c96d89..45c956c54 100644 --- a/TR5Main/Game/health.cpp +++ b/TR5Main/Game/health.cpp @@ -7,6 +7,7 @@ #include "level.h" #include "control/control.h" #include "Renderer11.h" +#include "item.h" using namespace TEN::Renderer; short PickupX; short PickupY; diff --git a/TR5Main/Game/items.cpp b/TR5Main/Game/items.cpp index f760a37e9..8ea42d416 100644 --- a/TR5Main/Game/items.cpp +++ b/TR5Main/Game/items.cpp @@ -6,7 +6,7 @@ #include "control/control.h" #include "floordata.h" #include "effects/effects.h" - +#include "item.h" using namespace TEN::Floordata; void ClearItem(short itemNum) diff --git a/TR5Main/Game/items.h b/TR5Main/Game/items.h index d23ecc116..19944d358 100644 --- a/TR5Main/Game/items.h +++ b/TR5Main/Game/items.h @@ -34,54 +34,6 @@ enum ItemFlags IFLAG_ACTIVATION_MASK = 0x3E00 // bits 9-13 }; -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; - short triggerFlags; - short carriedItem; - short afterDeath; - short firedWeapon; - short itemFlags[8]; - ITEM_DATA 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; -}; // used by fx->shade ! #define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F) diff --git a/TR5Main/Game/misc.cpp b/TR5Main/Game/misc.cpp index ba768e8f8..8eba35a8f 100644 --- a/TR5Main/Game/misc.cpp +++ b/TR5Main/Game/misc.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "animation.h" #include "itemdata/creature_info.h" - +#include "item.h" using std::vector; CREATURE_INFO* GetCreatureInfo(ITEM_INFO* item) { diff --git a/TR5Main/Game/missile.cpp b/TR5Main/Game/missile.cpp index 4ef0d7b36..0c5bcb347 100644 --- a/TR5Main/Game/missile.cpp +++ b/TR5Main/Game/missile.cpp @@ -9,6 +9,7 @@ #include "setup.h" #include "lara.h" #include "collide.h" +#include "item.h" #define SHARD_DAMAGE 30 #define ROCKET_DAMAGE 100 #define DIVER_HARPOON_DAMAGE 50 diff --git a/TR5Main/Game/newinv2.cpp b/TR5Main/Game/newinv2.cpp index c2692ad75..f2daf4770 100644 --- a/TR5Main/Game/newinv2.cpp +++ b/TR5Main/Game/newinv2.cpp @@ -18,7 +18,7 @@ #include "input.h" #include "pickup.h" #include "Renderer11.h" - +#include "item.h" using namespace TEN::Renderer; bool goUp, goDown, goRight, goLeft, goSelect, goDeselect; bool dbUp, dbDown, dbRight, dbLeft, dbSelect, dbDeselect; diff --git a/TR5Main/Game/objects.cpp b/TR5Main/Game/objects.cpp index a61f9770f..f89f94d27 100644 --- a/TR5Main/Game/objects.cpp +++ b/TR5Main/Game/objects.cpp @@ -15,7 +15,7 @@ #include "input.h" #include "Sound\sound.h" #include "collide.h" - +#include "item.h" OBJECT_TEXTURE* WaterfallTextures[6]; float WaterfallY[6]; int lastWaterfallY = 0; diff --git a/TR5Main/Game/particle/SimpleParticle.cpp b/TR5Main/Game/particle/SimpleParticle.cpp index ce5c12c81..805e24382 100644 --- a/TR5Main/Game/particle/SimpleParticle.cpp +++ b/TR5Main/Game/particle/SimpleParticle.cpp @@ -4,6 +4,7 @@ #include "Specific\trmath.h" #include #include "Specific\prng.h" +#include "item.h" using namespace TEN::Math::Random; namespace TEN::Effects{ diff --git a/TR5Main/Game/people.cpp b/TR5Main/Game/people.cpp index 86e4b7ddb..efb4aa8b4 100644 --- a/TR5Main/Game/people.cpp +++ b/TR5Main/Game/people.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.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/pickup/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp index 9a0821727..b877604de 100644 --- a/TR5Main/Game/pickup/pickup.cpp +++ b/TR5Main/Game/pickup/pickup.cpp @@ -28,7 +28,7 @@ #include "pickup/pickup_weapon.h" #include "pickup/pickup_consumable.h" #include "pickup/pickup_misc_items.h" - +#include "item.h" OBJECT_COLLISION_BOUNDS PickUpBounds = // offset 0xA1338 { 0xFF00, 0x0100, 0xFF38, 0x00C8, 0xFF00, 0x0100, 0xF8E4, 0x071C, 0x0000, 0x0000, diff --git a/TR5Main/Game/puzzles_keys.cpp b/TR5Main/Game/puzzles_keys.cpp index f4cb42efd..99bd6a5f2 100644 --- a/TR5Main/Game/puzzles_keys.cpp +++ b/TR5Main/Game/puzzles_keys.cpp @@ -14,7 +14,7 @@ #include "puzzles_keys.h" #include "generic_switch.h" #include "camera.h" - +#include "item.h" using namespace TEN::Entities::Switches; enum PuzzleType { diff --git a/TR5Main/Game/room.cpp b/TR5Main/Game/room.cpp index 2c7a57280..bc2a87bc1 100644 --- a/TR5Main/Game/room.cpp +++ b/TR5Main/Game/room.cpp @@ -4,7 +4,7 @@ #include "control/lot.h" #include "control/volume.h" #include "Renderer11.h" - +#include "item.h" using namespace TEN::Renderer; byte FlipStatus = 0; diff --git a/TR5Main/Game/rope.cpp b/TR5Main/Game/rope.cpp index 39f167d79..502d2c7e3 100644 --- a/TR5Main/Game/rope.cpp +++ b/TR5Main/Game/rope.cpp @@ -7,7 +7,7 @@ #include "control/control.h" #include "Sound\sound.h" #include "camera.h" - +#include "item.h" PENDULUM CurrentPendulum; PENDULUM AlternatePendulum; ROPE_STRUCT Ropes[12]; diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index e41f2f734..e87ba04af 100644 --- a/TR5Main/Game/savegame.cpp +++ b/TR5Main/Game/savegame.cpp @@ -17,7 +17,7 @@ #include "fullblock_switch.h" #include "itemdata/creature_info.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Entities::Switches; diff --git a/TR5Main/Game/sphere.cpp b/TR5Main/Game/sphere.cpp index 6c33551b8..3ae4f9748 100644 --- a/TR5Main/Game/sphere.cpp +++ b/TR5Main/Game/sphere.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "Renderer11.h" #include "Specific\trmath.h" - +#include "item.h" using namespace TEN::Renderer; bool GotLaraSpheres; diff --git a/TR5Main/Game/spotcam.cpp b/TR5Main/Game/spotcam.cpp index c9d7a501c..1df320de4 100644 --- a/TR5Main/Game/spotcam.cpp +++ b/TR5Main/Game/spotcam.cpp @@ -7,7 +7,7 @@ #include "lara.h" #include "input.h" #include "control\volume.h" - +#include "item.h" using namespace TEN::Renderer; using namespace TEN::Control::Volumes; diff --git a/TR5Main/Game/switch.cpp b/TR5Main/Game/switch.cpp index 251eac8cf..35c7b4744 100644 --- a/TR5Main/Game/switch.cpp +++ b/TR5Main/Game/switch.cpp @@ -16,7 +16,7 @@ #include "level.h" #include "input.h" #include "Sound\sound.h" - +#include "item.h" // NOTE: we need to decompile/inspect if these functions are still needed void ProcessExplodingSwitchType8(ITEM_INFO* item) diff --git a/TR5Main/Game/traps.cpp b/TR5Main/Game/traps.cpp index 4fd711a05..2aad85c64 100644 --- a/TR5Main/Game/traps.cpp +++ b/TR5Main/Game/traps.cpp @@ -14,6 +14,7 @@ #include "input.h" #include "room.h" #include "Sound/sound.h" +#include "item.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/Effects/flame_emitters.cpp b/TR5Main/Objects/Effects/flame_emitters.cpp index 7882d533b..dc6c354c9 100644 --- a/TR5Main/Objects/Effects/flame_emitters.cpp +++ b/TR5Main/Objects/Effects/flame_emitters.cpp @@ -13,7 +13,7 @@ #include #include #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Effects::Lightning; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/Effects/tr4_bubbles.cpp b/TR5Main/Objects/Effects/tr4_bubbles.cpp index 93222cbc3..d090b776b 100644 --- a/TR5Main/Objects/Effects/tr4_bubbles.cpp +++ b/TR5Main/Objects/Effects/tr4_bubbles.cpp @@ -12,7 +12,7 @@ #include "tr4_mutant.h" #include "collide.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; namespace TEN::entities::all diff --git a/TR5Main/Objects/Effects/tr4_locusts.cpp b/TR5Main/Objects/Effects/tr4_locusts.cpp index 80267170f..2572e04f5 100644 --- a/TR5Main/Objects/Effects/tr4_locusts.cpp +++ b/TR5Main/Objects/Effects/tr4_locusts.cpp @@ -8,7 +8,7 @@ #include "effects/tomb4fx.h" #include "collide.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { LOCUST_INFO Locusts[MAX_LOCUSTS]; diff --git a/TR5Main/Objects/Effects/tr5_electricity.cpp b/TR5Main/Objects/Effects/tr5_electricity.cpp index 1a854f6a9..938c93a20 100644 --- a/TR5Main/Objects/Effects/tr5_electricity.cpp +++ b/TR5Main/Objects/Effects/tr5_electricity.cpp @@ -11,7 +11,7 @@ #include "sphere.h" #include "traps.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; void TriggerElectricityWiresSparks(int x, int z, byte objNum, byte node, int flags) diff --git a/TR5Main/Objects/Generic/Doors/double_doors.cpp b/TR5Main/Objects/Generic/Doors/double_doors.cpp index 89ef1cd9b..dc531026b 100644 --- a/TR5Main/Objects/Generic/Doors/double_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/double_doors.cpp @@ -17,7 +17,7 @@ #include "misc.h" #include "double_doors.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::Doors { PHD_VECTOR DoubleDoorPos(0, 0, 220); diff --git a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp index bc9085821..ab23aaffd 100644 --- a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp +++ b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp @@ -18,7 +18,7 @@ #include "pushpull_kick_door.h" #include "collide.h" #include "itemdata/door_data.h" - +#include "item.h" namespace TEN::Entities::Doors { enum STATES_PUSHPULL_KICK_DOOR diff --git a/TR5Main/Objects/Generic/Doors/sequence_door.cpp b/TR5Main/Objects/Generic/Doors/sequence_door.cpp index 3fac743ef..0b152ce59 100644 --- a/TR5Main/Objects/Generic/Doors/sequence_door.cpp +++ b/TR5Main/Objects/Generic/Doors/sequence_door.cpp @@ -18,7 +18,7 @@ #include "sequence_door.h" #include "fullblock_switch.h" #include "itemdata/door_data.h" - +#include "item.h" using namespace TEN::Entities::Switches; namespace TEN::Entities::Doors diff --git a/TR5Main/Objects/Generic/Doors/steel_door.cpp b/TR5Main/Objects/Generic/Doors/steel_door.cpp index 0dfe44608..3709b8645 100644 --- a/TR5Main/Objects/Generic/Doors/steel_door.cpp +++ b/TR5Main/Objects/Generic/Doors/steel_door.cpp @@ -17,7 +17,7 @@ #include "misc.h" #include "steel_door.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::Doors { void InitialiseSteelDoor(short itemNumber) diff --git a/TR5Main/Objects/Generic/Doors/underwater_door.cpp b/TR5Main/Objects/Generic/Doors/underwater_door.cpp index 50b57d382..4992bd976 100644 --- a/TR5Main/Objects/Generic/Doors/underwater_door.cpp +++ b/TR5Main/Objects/Generic/Doors/underwater_door.cpp @@ -17,6 +17,7 @@ #include "misc.h" #include "underwater_door.h" #include "collide.h" +#include "item.h" namespace TEN::Entities::Doors { diff --git a/TR5Main/Objects/Generic/Object/generic_bridge.h b/TR5Main/Objects/Generic/Object/generic_bridge.h index 1d113fc8e..8f19cd443 100644 --- a/TR5Main/Objects/Generic/Object/generic_bridge.h +++ b/TR5Main/Objects/Generic/Object/generic_bridge.h @@ -1,7 +1,7 @@ #pragma once #include "Specific\phd_global.h" #include "level.h" - +#include "item.h" void InitialiseBridge(short itemNumber); int GetOffset(short angle, int x, int z); diff --git a/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp b/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp index 4d45d25c5..0c2cafb44 100644 --- a/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp +++ b/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp @@ -6,7 +6,7 @@ #include "control/control.h" #include "level.h" #include "animation.h" - +#include "item.h" OBJECT_COLLISION_BOUNDS CeilingTrapDoorBounds = {-256, 256, 0, 900, -768, -256, -1820, 1820, -5460, 5460, -1820, 1820}; static PHD_VECTOR CeilingTrapDoorPos = {0, 1056, -480}; OBJECT_COLLISION_BOUNDS FloorTrapDoorBounds = {-256, 256, 0, 0, -1024, -256, -1820, 1820, -5460, 5460, -1820, 1820}; diff --git a/TR5Main/Objects/Generic/Switches/cog_switch.cpp b/TR5Main/Objects/Generic/Switches/cog_switch.cpp index 1609748da..11abd09de 100644 --- a/TR5Main/Objects/Generic/Switches/cog_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/cog_switch.cpp @@ -9,7 +9,7 @@ #include "generic_doors.h" #include "collide.h" #include "animation.h" - +#include "item.h" using namespace TEN::Entities::Doors; namespace TEN::Entities::Switches diff --git a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp index 61bf0f571..6aa0e3b21 100644 --- a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp @@ -9,7 +9,7 @@ #include "level.h" #include "collide.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::Switches { PHD_VECTOR CrowbarPos = { -89, 0, -328 }; diff --git a/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp b/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp index bc416fa1d..661339be0 100644 --- a/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp @@ -7,7 +7,7 @@ #include "collide.h" #include "level.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::Switches { OBJECT_COLLISION_BOUNDS FullBlockSwitchBounds = diff --git a/TR5Main/Objects/Generic/Switches/generic_switch.cpp b/TR5Main/Objects/Generic/Switches/generic_switch.cpp index 9a421cd2c..24cfe00ef 100644 --- a/TR5Main/Objects/Generic/Switches/generic_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/generic_switch.cpp @@ -6,7 +6,7 @@ #include "generic_switch.h" #include "animation.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::Switches { OBJECT_COLLISION_BOUNDS SwitchBounds = diff --git a/TR5Main/Objects/Generic/Switches/jump_switch.cpp b/TR5Main/Objects/Generic/Switches/jump_switch.cpp index 2a0e92659..94e52d80c 100644 --- a/TR5Main/Objects/Generic/Switches/jump_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/jump_switch.cpp @@ -6,7 +6,7 @@ #include "generic_switch.h" #include "level.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::Switches { OBJECT_COLLISION_BOUNDS JumpSwitchBounds = diff --git a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp index 49fd2d6bf..60a23b1a5 100644 --- a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp @@ -8,7 +8,7 @@ #include "pickup.h" #include "level.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::Switches { OBJECT_COLLISION_BOUNDS PulleyBounds = diff --git a/TR5Main/Objects/Generic/Switches/rail_switch.cpp b/TR5Main/Objects/Generic/Switches/rail_switch.cpp index e5589855d..16501d589 100644 --- a/TR5Main/Objects/Generic/Switches/rail_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/rail_switch.cpp @@ -6,7 +6,7 @@ #include "level.h" #include "collide.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::Switches { PHD_VECTOR RailSwitchPos = { 0, 0, -550 }; diff --git a/TR5Main/Objects/Generic/Switches/turn_switch.cpp b/TR5Main/Objects/Generic/Switches/turn_switch.cpp index 35a157151..5db750c58 100644 --- a/TR5Main/Objects/Generic/Switches/turn_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/turn_switch.cpp @@ -9,6 +9,7 @@ #include "level.h" #include "collide.h" #include "animation.h" +#include "item.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp index c50da28d4..c31facbb8 100644 --- a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp @@ -7,6 +7,7 @@ #include "collide.h" #include "level.h" #include "animation.h" +#include "item.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Traps/dart_emitter.cpp b/TR5Main/Objects/Generic/Traps/dart_emitter.cpp index 9a828caf6..5cf67c2ae 100644 --- a/TR5Main/Objects/Generic/Traps/dart_emitter.cpp +++ b/TR5Main/Objects/Generic/Traps/dart_emitter.cpp @@ -5,7 +5,7 @@ #include "effects\effects.h" #include "items.h" #include "Sound\sound.h" - +#include "item.h" namespace TEN::Entities::Traps { void DartControl(short itemNumber) diff --git a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp index 9c4ff9e05..ed07c4b0c 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp @@ -6,7 +6,7 @@ #include "level.h" #include "lara.h" #include "control/control.h" - +#include "item.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 1d9a0d826..eb676ab5e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bear.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_bear.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.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 baa2b605d..de9b2162f 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp @@ -8,7 +8,7 @@ #include "people.h" #include "setup.h" #include "control/control.h" - +#include "item.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_doppelganger.cpp b/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp index d3dcdd611..ed1cd8e0b 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp @@ -7,7 +7,7 @@ #include "lara.h" #include "control/control.h" #include "animation.h" - +#include "item.h" // TODO: Evil lara is not targetable and cant move like lara. // get weapon damage to damage lara instead. (*25) diff --git a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp index 467dd8254..dba19eb2e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp @@ -10,7 +10,7 @@ #include "Sound/sound.h" #include "itemdata/creature_info.h" #include "animation.h" - +#include "item.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 bbd45bb1e..7da8151c0 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp @@ -9,7 +9,7 @@ #include "effects\effects.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" - +#include "item.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 5f29f8c48..d175d4180 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp @@ -9,6 +9,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" +#include "item.h" BITE_INFO wolfBite = { 0, -14, 174, 6 }; enum wolfStates { diff --git a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp index 483710b06..ac0fd5325 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp @@ -6,6 +6,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" +#include "item.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 dbac9502d..e9c44bcb0 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "level.h" #include "control/control.h" - +#include "item.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 3ec105630..bd4be1702 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp @@ -14,7 +14,7 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" #define DRAGON_SWIPE_DAMAGE 250 #define DRAGON_TOUCH_DAMAGE 10 #define DRAGON_DIE_ANIM 21 diff --git a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp index 258163e28..616101b39 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" - +#include "item.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 4cd4bfd07..618005ee3 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp @@ -11,7 +11,7 @@ #include "itemdata/creature_info.h" #include "floordata.h" #include "collide.h" - +#include "item.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 11300e23b..931f1475e 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp @@ -7,7 +7,7 @@ #include "control/control.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" - +#include "item.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 5b2980351..27146fbb4 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp @@ -7,6 +7,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" +#include "item.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 d942307ff..7d4190e03 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_rat.cpp @@ -8,7 +8,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.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 e18d4cf46..95b42ff97 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_shark.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_shark.cpp @@ -7,7 +7,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.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 93c5a5562..a7d94c77f 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp @@ -6,6 +6,7 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" +#include "item.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 d8902bb61..49c123f13 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp @@ -14,7 +14,7 @@ #include "itemdata/creature_info.h" #include "skidoo_info.h" #include "animation.h" - +#include "item.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 f1d5536ad..29091ff3a 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.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 a0cdaab18..cae41efe7 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spider.cpp @@ -11,7 +11,7 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" - +#include "item.h" BITE_INFO spiderBite = { 0, 0, 41, 1 }; static void S_SpiderBite(ITEM_INFO* item) diff --git a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp index 1fdcfcc94..16d7895bf 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp @@ -10,7 +10,7 @@ #include "lara.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO swordBite = { 0, 37, 550, 15 }; void InitialiseSwordGuardian(short itemNum) diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp index f978613bb..c12eee7cc 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp @@ -6,7 +6,7 @@ #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" - +#include "item.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 bff2a8522..d6bcb5b1c 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp @@ -13,7 +13,7 @@ #include "effects/effects.h" #include "Specific/trmath.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO workerFlameThrower = { 0, 250, 32, 9 }; static void Flame(DWORD x, int y, DWORD z, int speed, WORD yrot, WORD roomNumber) diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp index ba16a6f8c..49a6c3e71 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp @@ -8,7 +8,7 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO workerMachineGun = { 0, 308, 32, 9 }; void InitialiseWorkerMachineGun(short itemNum) diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp index bf1b0aba6..e3479d857 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp @@ -8,7 +8,7 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO workerShotgun = { 0, 281, 40, 9 }; static void ShotLara_WithShotgun(ITEM_INFO* item, AI_INFO* info, BITE_INFO* bite, short angle_y, int damage) diff --git a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp index 74004778c..e6805a699 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp @@ -8,7 +8,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO yetiBiteR = { 12, 101, 19, 10 }; BITE_INFO yetiBiteL = { 12, 101, 19, 13 }; diff --git a/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp b/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp index 38afab26f..a1ab52ca4 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "effects/effects.h" #include "animation.h" - +#include "item.h" void InitialiseKillerStatue(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp index f329c87c7..467e2b7de 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp @@ -8,7 +8,7 @@ #include "Sound/sound.h" #include "items.h" #include "animation.h" - +#include "item.h" void InitialiseSpinningBlade(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp b/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp index 7124bc83f..eebaf8a40 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "lara.h" #include "animation.h" - +#include "item.h" void SpringBoardControl(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR2/Vehicles/boat.cpp b/TR5Main/Objects/TR2/Vehicles/boat.cpp index c92c8c35b..f64e62106 100644 --- a/TR5Main/Objects/TR2/Vehicles/boat.cpp +++ b/TR5Main/Objects/TR2/Vehicles/boat.cpp @@ -13,7 +13,7 @@ #include "effects/effects.h" #include "particle/SimpleParticle.h" #include "boat_info.h" - +#include "item.h" enum BOAT_STATE { STATE_BOAT_GETON, diff --git a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp index 80aed8d95..166df9fa6 100644 --- a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp +++ b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp @@ -18,7 +18,7 @@ #include "Specific/prng.h" #include "camera.h" #include "skidoo_info.h" - +#include "item.h" using std::vector; using namespace TEN::Math::Random; diff --git a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp index 17f8e3db2..29a3e4d42 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO civvy_hit = { 0,0,0, 13 }; enum civvy_anims { diff --git a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp index e3754a9e2..ad7f23147 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO cobraBite = { 0, 0, 0, 13 }; void InitialiseCobra(short itemNum) diff --git a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp index c7c039f1b..6a5a2089d 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp @@ -6,7 +6,7 @@ #include "fish.h" #include "control/control.h" #include "effects\effects.h" - +#include "item.h" #define PIRAHNA_DAMAGE 4 #define X 0 #define Y 1 diff --git a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp index 499f77dbf..49f0eda22 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp @@ -12,7 +12,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO flamerBite = { 0, 340, 64, 7 }; static void TriggerPilotFlame(int itemnum) diff --git a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp index 26e8e0341..9807e51f4 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp @@ -9,7 +9,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO monkeyBite = { 10, 10, 11, 13 }; void InitialiseMonkey(short itemNumber) diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp index b4e0efb67..868450321 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp @@ -11,7 +11,7 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" enum MPGUN_STATES { MPGUN_EMPTY, diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp index 95517c8c0..e40f50a9c 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp @@ -10,7 +10,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.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 ae3aa6b27..c31badc16 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" static BITE_INFO raptorBite = { 0, 66, 318, 22 }; void RaptorControl(short itemNum) diff --git a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp index 78c3dfc42..3fd84512d 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp @@ -9,7 +9,7 @@ #include "control/control.h" #include "control\los.h" #include "effects\effects.h" - +#include "item.h" BITE_INFO scubaGun = { 17, 164, 44, 18 }; static void ShootHarpoon(ITEM_INFO* frogman, int x, int y, int z, short speed, short yRot, short roomNumber) diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index 7840fb2ff..4ece29553 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp @@ -10,7 +10,7 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO shivaLeftBite = { 0, 0, 920, 13 }; BITE_INFO shivaRightBite = { 0, 0, 920, 22 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp index 005be9e25..5974c6add 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp @@ -13,7 +13,7 @@ #include "level.h" #include "lara.h" #include "Sound\sound.h" - +#include "item.h" static BOSS_STRUCT BossData; #define MAX_TRIGGER_RANGE 0x4000 diff --git a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp index 7e35fe549..efb008096 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO tigerBite = { 19, -13, 3, 26 }; void TigerControl(short itemNum) diff --git a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp index 745103efc..0dcd03e30 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp @@ -15,7 +15,7 @@ #include "itemdata/creature_info.h" #include "collide.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; enum TonyFlameType diff --git a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp index 5017b5102..a6dde95ca 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp @@ -8,6 +8,8 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" +#include "item.h" + void LaraTyrannosaurDeath(ITEM_INFO* item) { item->goalAnimState = 8; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp index 666b76867..4984059eb 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp @@ -12,7 +12,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include - +#include "item.h" using namespace TEN::Entities::Traps; BITE_INFO tribesmanAxeBite = { 0, 16, 265, 13 }; diff --git a/TR5Main/Objects/TR3/Trap/train.cpp b/TR5Main/Objects/TR3/Trap/train.cpp index 73d4d8aab..963af0765 100644 --- a/TR5Main/Objects/TR3/Trap/train.cpp +++ b/TR5Main/Objects/TR3/Trap/train.cpp @@ -10,6 +10,7 @@ #include "lara.h" #include "collide.h" #include "animation.h" +#include "item.h" #define TRAIN_VEL 260 #define LARA_TRAIN_DEATH_ANIM 3; diff --git a/TR5Main/Objects/TR3/Vehicles/biggun.cpp b/TR5Main/Objects/TR3/Vehicles/biggun.cpp index da9a84d42..0b77dd56c 100644 --- a/TR5Main/Objects/TR3/Vehicles/biggun.cpp +++ b/TR5Main/Objects/TR3/Vehicles/biggun.cpp @@ -15,6 +15,7 @@ #include "setup.h" #include "camera.h" #include "biggun_info.h" +#include "item.h" static long GunRotYAdd = 0; bool barrelRotating; diff --git a/TR5Main/Objects/TR3/Vehicles/kayak.cpp b/TR5Main/Objects/TR3/Vehicles/kayak.cpp index 246553f2c..be6f88350 100644 --- a/TR5Main/Objects/TR3/Vehicles/kayak.cpp +++ b/TR5Main/Objects/TR3/Vehicles/kayak.cpp @@ -12,6 +12,7 @@ #include "input.h" #include "control/control.h" #include "kayak_info.h" +#include "item.h" using std::vector; #define KAYAK_COLLIDE 64 diff --git a/TR5Main/Objects/TR3/Vehicles/minecart.cpp b/TR5Main/Objects/TR3/Vehicles/minecart.cpp index b660a4c75..f21f9ceaa 100644 --- a/TR5Main/Objects/TR3/Vehicles/minecart.cpp +++ b/TR5Main/Objects/TR3/Vehicles/minecart.cpp @@ -14,7 +14,7 @@ #include "input.h" #include "Sound\sound.h" #include "minecart_info.h" - +#include "item.h" using std::vector; enum MINECART_STATE { diff --git a/TR5Main/Objects/TR3/Vehicles/quad.cpp b/TR5Main/Objects/TR3/Vehicles/quad.cpp index 3b57e7d21..970b34653 100644 --- a/TR5Main/Objects/TR3/Vehicles/quad.cpp +++ b/TR5Main/Objects/TR3/Vehicles/quad.cpp @@ -16,7 +16,7 @@ #include "Sound/sound.h" #include "Specific/prng.h" #include "quad_info.h" - +#include "item.h" using std::vector; using namespace TEN::Math::Random; enum QUAD_EFFECTS_POSITIONS { diff --git a/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp b/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp index b0be35e1b..372dc1c1d 100644 --- a/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp +++ b/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp @@ -12,7 +12,7 @@ #include "camera.h" #include "setup.h" #include "rubberboat_info.h" - +#include "item.h" #define RUBBER_BOAT_FRONT 750 #define RUBBER_BOAT_SIDE 300 #define RUBBER_BOAT_RADIUS 500 diff --git a/TR5Main/Objects/TR3/Vehicles/upv.cpp b/TR5Main/Objects/TR3/Vehicles/upv.cpp index ca27df35d..80cef9b97 100644 --- a/TR5Main/Objects/TR3/Vehicles/upv.cpp +++ b/TR5Main/Objects/TR3/Vehicles/upv.cpp @@ -19,6 +19,7 @@ #include "Sound\sound.h" #include "upv_info.h" #include "control\los.h" +#include "item.h" #define UPV_CONTROL 1 #define UPV_SURFACE 2 diff --git a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp index dc780ea44..80afa53df 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp @@ -14,7 +14,7 @@ #include "items.h" #include "control/lot.h" #include "itemdata/creature_info.h" - +#include "item.h" using namespace TEN::Effects::Environment; namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp index 4690f9296..0942893b0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp @@ -10,7 +10,7 @@ #include "effects\weather.h" #include "effects\tomb4fx.h" #include "itemdata/creature_info.h" - +#include "item.h" using std::vector; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp index 0ee992328..a894ebc9f 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp @@ -11,7 +11,7 @@ #include "animation.h" #include "control/lot.h" #include "itemdata/creature_info.h" - +#include "item.h" /* ID_BADDY_1 1 - Rolls to the right 1 square diff --git a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp index bdb2c22b9..0abf5d130 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp @@ -9,6 +9,7 @@ #include "setup.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" +#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp index 518f19fe4..b5ddc225c 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp @@ -11,7 +11,7 @@ #include #include #include "itemdata/creature_info.h" - +#include "item.h" namespace TEN::Entities::TR4 { BITE_INFO BitBeetleBite = { 0,0,0,12 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp index 7544705e7..44a067f32 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" int CutSeqNum; BITE_INFO scorpionBite1 = { 0, 0, 0, 8 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp index 1651a7162..7dc4839bd 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp @@ -13,7 +13,7 @@ #include "itemdata/creature_info.h" #include "collide.h" #include "control/control.h" - +#include "item.h" enum CROCODILE_STATE { CROC_EMPTY, diff --git a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp index 040d13386..ede15d77f 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp @@ -13,7 +13,7 @@ #include "lara.h" #include "control/control.h" #include "itemdata/creature_info.h" - +#include "item.h" extern SMOKE_SPARKS SmokeSparks[MAX_SPARKS_SMOKE]; static void DemigodThrowEnergyAttack(PHD_3DPOS* pos, short roomNumber, int flags) diff --git a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp index cf0fca54f..c6db1af23 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp @@ -7,7 +7,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" namespace TEN::Entities::TR4 { enum DOG_STATES diff --git a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp index 29ad75e88..173c9f972 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp @@ -15,7 +15,7 @@ #include "control/trigger.h" #include "effects/effects.h" #include "effects/tomb4fx.h" - +#include "item.h" ITEM_INFO jeepDummyTarget; void EnemyJeepLaunchGrenade(ITEM_INFO* item) diff --git a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp index e7c5e2ae0..ad8f375b0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp @@ -11,7 +11,7 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" #define STATE_GUIDE_STOP 1 #define STATE_GUIDE_WALK 2 #define STATE_GUIDE_RUN 3 diff --git a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp index 90cbdfe78..2c6555f2a 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp @@ -11,7 +11,7 @@ #include "misc.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" #define STATE_HAMMERHEAD_STOP 0 #define STATE_HAMMERHEAD_SWIM_SLOW 1 #define STATE_HAMMERHEAD_SWIM_FAST 2 diff --git a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp index 88ba212e4..38e215343 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp @@ -12,7 +12,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO harpyBite1 = { 0, 0, 0, 4 }; BITE_INFO harpyBite2 = { 0, 0, 0, 2 }; BITE_INFO harpyBite3 = { 0, 0, 0, 21 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp index 9b63f1223..7fdc63c1a 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp @@ -11,7 +11,7 @@ #include "sphere.h" #include "control/box.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { enum HORSEMAN_STATES diff --git a/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp b/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp index 179e51a1b..6a08dcdc3 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "control/control.h" #include "animation.h" - +#include "item.h" void InitialiseJeanYves(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp index 2ff8930a0..edaebb889 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp @@ -10,7 +10,7 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO knightTemplarBite = { 0, 0, 0, 11 }; void InitialiseKnightTemplar(short itemNumber) diff --git a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp index d82df5d44..53a9d08d4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "setup.h" #include "flipeffect.h" - +#include "item.h" namespace TEN::Entities::TR4 { SCARAB_INFO Scarabs[NUM_LITTLE_BETTLES]; diff --git a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp index ff60fa243..9672c7ef4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp @@ -10,7 +10,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" enum MUMMY_STATES { STATE_MUMMY_ARMS_CROSSED = 0, STATE_MUMMY_STOP = 1, diff --git a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp index dd03eb12d..ffc3ab212 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp @@ -11,7 +11,7 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void TriggerCrocgodMissile(PHD_3DPOS* src, short roomNumber, short counter) diff --git a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp index caf3e5435..671141400 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp @@ -13,7 +13,7 @@ #include "Specific/input.h" #include "Lara/lara_one_gun.h" #include "itemdata/creature_info.h" - +#include "item.h" namespace TEN::Entities::TR4 { enum SAS_STATES diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp index 75da972e4..ed7ecfcbc 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp @@ -17,7 +17,7 @@ #include "objectslist.h" #include "itemdata/creature_info.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { #ifndef NEW_INV diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp index b1f286838..66824b651 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp @@ -10,7 +10,7 @@ #include "people.h" #include "itemdata/creature_info.h" #include "animation.h" - +#include "item.h" BITE_INFO SethaBite1 = { 0,220,50,17 }; BITE_INFO SethaBite2 = { 0,220,50,13 }; BITE_INFO SethaAttack1 = { -16,200,32,13 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp index 94e87e6d5..73ea46b14 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp @@ -15,7 +15,7 @@ #include "itemdata/creature_info.h" #include "floordata.h" #include "collide.h" - +#include "item.h" namespace TEN::Entities::TR4 { BITE_INFO skeletonBite = { 0, -16, 200, 11 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp index 0b9c24bec..f7de2e681 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.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 1c44d0831..03c0aa8fe 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" enum SPHIX_STATES { SPHINX_EMPTY, SPHINX_SLEEPING, diff --git a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp index ca1ad7de3..ff6228375 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp @@ -12,7 +12,7 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" - +#include "item.h" BITE_INFO TroopsBite1 = { 0, 300, 64, 7 }; #define STATE_TROOPS_STOP 1 diff --git a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp index 5756fd163..6aaa9b7f7 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp @@ -10,7 +10,7 @@ #include "Sound/sound.h" #include "animation.h" #include "itemdata/creature_info.h" - +#include "item.h" #define STATE_VON_CROY_STOP 1 #define STATE_VON_CROY_WALK 2 #define STATE_VON_CROY_RUN 3 diff --git a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp index 5597591e9..77ddcb173 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO wildboardBiteInfo = { 0, 0, 0, 14 }; void InitialiseWildBoar(short itemNumber) diff --git a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp index 57a676f7d..62848ed7c 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp @@ -13,7 +13,7 @@ #include "effects/tomb4fx.h" #include "tr4_wraith_info.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; constexpr auto WRAITH_COUNT = 8; diff --git a/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp b/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp index edb98b229..35aa10db6 100644 --- a/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp +++ b/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_burningfloor.h" #include "level.h" - +#include "item.h" void InitialiseBurningFloor(short itemNum) { g_Level.Items[itemNum].requiredAnimState = 127; diff --git a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp index 2f15b9d2b..80ac77e17 100644 --- a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp @@ -6,7 +6,7 @@ #include "animation.h" #include "Sound\sound.h" #include "collide.h" - +#include "item.h" void ClockworkBeetleControl(short item_number) { ITEM_INFO* beetle = &g_Level.Items[item_number]; diff --git a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp index 91b0a0764..9dac09d9f 100644 --- a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp @@ -12,7 +12,7 @@ #include #include "generic_switch.h" #include "collide.h" - +#include "item.h" using namespace TEN::Entities::Switches; namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp index f1fc2dee6..08f069b9e 100644 --- a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp @@ -6,7 +6,7 @@ #include "control/box.h" #include "lara.h" #include "animation.h" - +#include "item.h" void InitialiseLaraDouble(short itemNum) { ClearItem(itemNum); diff --git a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp index 98c6f2a03..d0fb89ecb 100644 --- a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp @@ -7,7 +7,7 @@ #include #include #include - +#include "item.h" namespace TEN::Entities::TR4 { void InitialiseMapper(short itemNumber) diff --git a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp index 994d139ee..99053b7c9 100644 --- a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp @@ -11,7 +11,7 @@ #include "input.h" #include "animation.h" #include - +#include "item.h" using namespace TEN::Effects::Lightning; void InitialiseObelisk(short itemNumber) diff --git a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp index a0e1e45fd..3b1987c13 100644 --- a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp @@ -7,7 +7,7 @@ #include "pickup.h" #include "setup.h" #include "health.h" - +#include "item.h" OBJECT_COLLISION_BOUNDS SarcophagusBounds = { 0xFE00, 512, 0xFF9C, 100, 0xFE00, 0, diff --git a/TR5Main/Objects/TR4/Object/tr4_scales.cpp b/TR5Main/Objects/TR4/Object/tr4_scales.cpp index d66bf8a61..5b7c56acf 100644 --- a/TR5Main/Objects/TR4/Object/tr4_scales.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_scales.cpp @@ -11,7 +11,7 @@ #include "effects\tomb4fx.h" #include "tr4_ahmet.h" #include "generic_switch.h" - +#include "item.h" using namespace TEN::Entities::Switches; using namespace TEN::Entities::TR4; diff --git a/TR5Main/Objects/TR4/Object/tr4_senet.cpp b/TR5Main/Objects/TR4/Object/tr4_senet.cpp index 577fd61a8..371d4b8b7 100644 --- a/TR5Main/Objects/TR4/Object/tr4_senet.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_senet.cpp @@ -10,6 +10,7 @@ #include "input.h" #include "level.h" #include "collide.h" +#include "item.h" short SenetPiecesNumber[6]; char SenetDisplacement, ActiveSenetPieces[6], SenetBoard[17]; int SenetTargetX, SenetTargetZ; diff --git a/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp index a5a628672..669fbe8d0 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void BirdBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp index 5450b19ad..6675f4ec4 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "control/control.h" #include "effects\effects.h" - +#include "item.h" namespace TEN::Entities::TR4 { void BladeCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll) diff --git a/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp index fe92698e1..f49a695a9 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void CatwalkBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_chain.cpp b/TR5Main/Objects/TR4/Trap/tr4_chain.cpp index 838ae2d9f..bdfa26f57 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_chain.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_chain.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void ChainControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp index 423b0bacd..0c19f666f 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp @@ -7,7 +7,7 @@ #include "effects/effects.h" #include "Lara/lara.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void CogControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp b/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp index 9db757ca7..7403d997d 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void FourBladesControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp index 1bf071edb..3070d2a37 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp @@ -6,7 +6,7 @@ #include "Sound/sound.h" #include "lara.h" #include "effects/effects.h" - +#include "item.h" namespace TEN::Entities::TR4 { void InitialiseJobySpikes(short itemNumber) diff --git a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp index d86b7c4cb..912cbcf68 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp @@ -9,7 +9,7 @@ #include "items.h" #include "collide.h" #include "objectslist.h" - +#include "item.h" using namespace TEN::Effects::Environment; namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp index f87fe08d8..677d634be 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp @@ -7,7 +7,7 @@ #include #include #include - +#include "item.h" namespace TEN::Entities::TR4 { void MovingBladeControl(short itemNumber) diff --git a/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp index 165ffade0..e60690546 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void PlinthBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_plough.cpp b/TR5Main/Objects/TR4/Trap/tr4_plough.cpp index 7594151e2..c189b56f1 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_plough.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_plough.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void PloughControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp index 0fb11f61e..4cceed3ba 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp @@ -4,7 +4,7 @@ #include "setup.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void InitialiseSethBlade(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp index 9a338a6c4..1c92a5dda 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp @@ -5,7 +5,7 @@ #include "items.h" #include "animation.h" #include "Specific\trmath.h" - +#include "item.h" namespace TEN::Entities::TR4 { void InitialiseSlicerDicer(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp index 68796a008..36170b628 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control/control.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { void SpikeballControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp index 511eea568..e51806871 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp @@ -7,7 +7,7 @@ #include "lara.h" #include "effects/effects.h" #include "animation.h" - +#include "item.h" void ControlSpikyCeiling(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp index b5087a5ba..59b7f7b95 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "items.h" #include "effects\effects.h" - +#include "item.h" void ControlSpikyWall(short itemNum) { ITEM_INFO* item = &g_Level.Items[itemNum]; diff --git a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp index 2a0b42dc5..414a56abe 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "effects/effects.h" #include "animation.h" - +#include "item.h" namespace TEN::Entities::TR4 { short StargateBounds[24] = diff --git a/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp b/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp index 9cda6ebe8..6d44491e4 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp @@ -7,7 +7,7 @@ #include "effects\tomb4fx.h" #include "Specific\trmath.h" #include "setup.h" - +#include "item.h" namespace TEN::Entities::TR4 { short SPyoffs[8] = diff --git a/TR5Main/Objects/TR4/Vehicles/jeep.cpp b/TR5Main/Objects/TR4/Vehicles/jeep.cpp index afad1e512..c7cbc7c6e 100644 --- a/TR5Main/Objects/TR4/Vehicles/jeep.cpp +++ b/TR5Main/Objects/TR4/Vehicles/jeep.cpp @@ -19,7 +19,7 @@ #include "level.h" #include "animation.h" #include "jeep_info.h" - +#include "item.h" using std::vector; enum JEEP_STATES diff --git a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp index 6c5a854d9..277149abb 100644 --- a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp +++ b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp @@ -21,7 +21,7 @@ #include "animation.h" #include "Specific/prng.h" #include "motorbike_info.h" - +#include "item.h" using namespace TEN::Math::Random; /*collision stuff*/ diff --git a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp index 05140c50e..d55b09018 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "animation.h" #include - +#include "item.h" int NextBat; BAT_STRUCT Bats[NUM_BATS]; diff --git a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp index 2b1a5f58e..eaa76c66c 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp @@ -8,6 +8,7 @@ #include "effects\tomb4fx.h" #include "Sound\sound.h" #include "lara.h" +#include "item.h" int NextRat; RAT_STRUCT Rats[NUM_RATS]; diff --git a/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp index 2326b489c..253ac97e7 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp @@ -4,6 +4,7 @@ #include "items.h" #include "level.h" #include "Specific\trmath.h" +#include "item.h" void InitialiseSmokeEmitter(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp index 1cd630893..9b6640a63 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp @@ -8,6 +8,7 @@ #include "effects\tomb4fx.h" #include "Sound\sound.h" #include "lara.h" +#include "item.h" int NextSpider; SPIDER_STRUCT Spiders[NUM_SPIDERS]; diff --git a/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp b/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp index 41a764bf9..c81f3944b 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp @@ -8,7 +8,7 @@ #include "effects\tomb4fx.h" #include "level.h" #include "Sound\sound.h" - +#include "item.h" void InitialiseAutoGuns(short itemNumber) { ITEM_INFO* item; diff --git a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp index ed8f72d77..86c8bdbc9 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp @@ -9,7 +9,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.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 04e4ea7aa..7832976a4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp @@ -12,7 +12,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" #define STATE_CHEF_COOKING 1 #define STATE_CHEF_TURN_180 2 #define STATE_CHEF_ATTACK 3 diff --git a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp index f6dddbb20..32dc2f856 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp @@ -15,7 +15,7 @@ #include "itemdata/creature_info.h" #include "Game/effects/lightning.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp b/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp index a594f49e1..7cb8ca19d 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp @@ -7,7 +7,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.h" BITE_INFO DobermanBite = { 0, 0x1E, 0x8D, 0x14 }; void InitialiseDoberman(short itemNum) diff --git a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp b/TR5Main/Objects/TR5/Entity/tr5_dog.cpp index b670a81eb..163cf4273 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_dog.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" - +#include "item.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 e1368a10d..95b11fec6 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp @@ -8,7 +8,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO InvisibleGhostBite = { 0, 0, 0, 17 }; void InitialiseInvisibleGhost(short itemNum) diff --git a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp index 3ce4a1291..20d0b0fdc 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp @@ -11,7 +11,7 @@ #include "Sound/sound.h" #include "itemdata/creature_info.h" #include "animation.h" - +#include "item.h" BITE_INFO GladiatorBite = { 0, 0, 0, 16 }; void InitialiseGladiator(short itemNum) diff --git a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp index 54fe16dd4..0ea4fb27f 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp @@ -12,7 +12,7 @@ #include "lara.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" - +#include "item.h" BITE_INFO SwatGun = { 80, 200, 13, 0 }; BITE_INFO SniperGun = { 0, 480, 110, 13 }; BITE_INFO ArmedBaddy2Gun = { -50, 220, 60, 13 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp b/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp index 704e86d43..5421c4a13 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp @@ -10,7 +10,7 @@ #include "objects.h" #include "items.h" #include "lara.h" - +#include "item.h" int GunShipCounter = 0; void ControlGunShip(short itemNumber) diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp index 5e1b7d0bd..2d4b72fc7 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp @@ -11,7 +11,7 @@ #include "lara.h" #include "Sound\sound.h" #include "itemdata/creature_info.h" - +#include "item.h" #define STATE_HYDRA_STOP 0 #define STATE_HYDRA_BITE_ATTACK1 1 #define STATE_HYDRA_AIM 2 diff --git a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp index 24b1a3de8..5db65c857 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp @@ -11,6 +11,7 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" +#include "item.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 7531f26af..a8d58919d 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp @@ -13,6 +13,7 @@ #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" +#include "item.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 58ad04611..049cb9b04 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_larson.cpp @@ -10,6 +10,7 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" +#include "item.h" #define STATE_TR5_LARSON_STOP 1 #define STATE_TR5_LARSON_WALK 2 diff --git a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp index 6f93b5e02..db7c5c88f 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp @@ -17,6 +17,7 @@ #include "tr5_laserhead_info.h" #include #include "Game/effects/lara_burn.h" +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp index 2d0498a0c..3f9343cda 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp @@ -11,6 +11,7 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" +#include "item.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 619c66bd7..e88af9506 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp @@ -7,6 +7,8 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" +#include "item.h" + void InitialiseReaper(short itemNum) { ITEM_INFO* item; diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp index b32b783c7..8ae86bbb6 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp @@ -15,6 +15,7 @@ #include "Sound\sound.h" #include "itemdata/creature_info.h" #include +#include "item.h" using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp index 82e96ec7e..aaf2a2496 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp @@ -16,6 +16,7 @@ #include "itemdata/creature_info.h" #include "collide.h" #include "control\los.h" +#include "item.h" static void TriggerSubmarineSparks(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp b/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp index 6d9f3c79e..69cca5769 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp @@ -3,6 +3,7 @@ #include "items.h" #include "setup.h" #include "level.h" +#include "item.h" void InitialiseLightingGuide(short itemNum) { diff --git a/TR5Main/Objects/TR5/Light/tr5_light.cpp b/TR5Main/Objects/TR5/Light/tr5_light.cpp index 108858fd1..e24ccb38a 100644 --- a/TR5Main/Objects/TR5/Light/tr5_light.cpp +++ b/TR5Main/Objects/TR5/Light/tr5_light.cpp @@ -6,6 +6,7 @@ #include "Sound/sound.h" #include "Specific/trmath.h" #include "animation.h" +#include "item.h" void PulseLightControl(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp index 7ea0205c4..46d459fca 100644 --- a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp @@ -9,7 +9,7 @@ #include "camera.h" #include "lara.h" #include "collide.h" - +#include "item.h" void InitialiseExpandingPlatform(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp index bba3aeaff..a600ee38b 100644 --- a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp @@ -8,7 +8,7 @@ #include "animation.h" #include "lara.h" #include "lara_collide.h" - +#include "item.h" void GenSlot1Control(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp index 273a11efd..5e0ecee3d 100644 --- a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp @@ -5,7 +5,7 @@ #include "room.h" #include "Sound/sound.h" #include "objectslist.h" - +#include "item.h" void InitialiseHighObject1(short itemNumber) { int x = 0; diff --git a/TR5Main/Objects/TR5/Object/tr5_missile.cpp b/TR5Main/Objects/TR5/Object/tr5_missile.cpp index 71a8de467..e1e19ad2b 100644 --- a/TR5Main/Objects/TR5/Object/tr5_missile.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_missile.cpp @@ -16,6 +16,7 @@ #include "tr5_hydra.h" #include "collide.h" #include "Game/effects/lara_burn.h" +#include "item.h" using namespace TEN::Effects::Fire; diff --git a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp index 62a769616..5a86d9d1b 100644 --- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp @@ -11,6 +11,7 @@ #include "Sound\sound.h" #include "setup.h" #include "tr5_pushableblock_info.h" +#include "item.h" static OBJECT_COLLISION_BOUNDS PushableBlockBounds = { 0x0000, 0x0000, 0xFFC0, 0x0000, diff --git a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp index 4c7845a8f..d22901042 100644 --- a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp @@ -8,6 +8,7 @@ #include "objectslist.h" #include "Sound/sound.h" #include "camera.h" +#include "item.h" void InitialiseRaisingBlock(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp index 5a50316c1..489a9099a 100644 --- a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp @@ -9,6 +9,7 @@ #include "effects/effects.h" #include "level.h" #include "animation.h" +#include "item.h" void RollingBallCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* coll) { diff --git a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp index 3a4efb8dd..2c6a32248 100644 --- a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp @@ -8,6 +8,7 @@ #include "lara.h" #include "camera.h" #include "control/box.h" +#include "item.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp index cea9701cf..392d2d93f 100644 --- a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp @@ -6,6 +6,7 @@ #include "lara.h" #include "Sound\sound.h" #include "collide.h" +#include "item.h" void InitialiseTwoBlocksPlatform(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp index a66026732..73c676527 100644 --- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp +++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp @@ -6,6 +6,7 @@ #include "effects\tomb4fx.h" #include "items.h" #include "Specific\trmath.h" +#include "item.h" void InitialiseSmashObject(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp index 165dc9c70..d4f618b04 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp @@ -7,7 +7,7 @@ #include "generic_switch.h" #include "Sound/sound.h" #include "animation.h" - +#include "item.h" using namespace TEN::Entities::Switches; namespace TEN::Entities::TR5 diff --git a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp index e7b0045c9..2f48b0dad 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp @@ -8,6 +8,7 @@ #include "objectslist.h" #include "generic_switch.h" #include "animation.h" +#include "item.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp index 18f63f11c..cd0b4828b 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp @@ -7,7 +7,7 @@ #include "Sound/sound.h" #include "control/box.h" #include "animation.h" - +#include "item.h" OBJECT_COLLISION_BOUNDS DeathSlideBounds = { -256, 256, -100, 100, 256, 512, 0, 0, -ANGLE(25.0f), ANGLE(25.0f), 0, 0 }; PHD_VECTOR DeathSlidePosition(0, 0, 371); diff --git a/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp b/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp index cb158fded..9c76622ce 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp @@ -15,7 +15,7 @@ #include "collide.h" #include "control/box.h" #include "Game/effects/lara_burn.h" - +#include "item.h" using namespace TEN::Effects::Fire; using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp b/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp index 292b32637..a5022df94 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "control/control.h" #include "animation.h" - +#include "item.h" void FallingCeilingControl(short itemNumber) { ITEM_INFO* item = &g_Level.Items[itemNumber]; diff --git a/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp b/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp index 214a68f4f..cf46739ed 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp @@ -2,6 +2,7 @@ #include "tr5_romehammer.h" #include "items.h" #include "level.h" +#include "item.h" void InitialiseRomeHammer(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp b/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp index 008c97d19..7402e80f7 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp @@ -6,6 +6,7 @@ #include "lara.h" #include "camera.h" #include "effects\effects.h" +#include "item.h" static void VentilatorEffect(BOUNDING_BOX* bounds, int intensity, short rot, int speed) { diff --git a/TR5Main/Renderer/Render11Helper.cpp b/TR5Main/Renderer/Render11Helper.cpp index 375271e73..4f6dca3a1 100644 --- a/TR5Main/Renderer/Render11Helper.cpp +++ b/TR5Main/Renderer/Render11Helper.cpp @@ -24,7 +24,7 @@ #include "rubberboat_info.h" #include "upv_info.h" #include "biggun_info.h" - +#include "item.h" extern GameConfiguration g_Configuration; extern GameFlow *g_GameFlow; diff --git a/TR5Main/Renderer/Renderer11Draw.cpp b/TR5Main/Renderer/Renderer11Draw.cpp index f05e61fa4..e287859ed 100644 --- a/TR5Main/Renderer/Renderer11Draw.cpp +++ b/TR5Main/Renderer/Renderer11Draw.cpp @@ -31,7 +31,7 @@ #include #include #include - +#include "item.h" extern TEN::Renderer::RendererHUDBar *g_DashBar; extern TEN::Renderer::RendererHUDBar *g_SFXVolumeBar; extern TEN::Renderer::RendererHUDBar *g_MusicVolumeBar; diff --git a/TR5Main/Renderer/Renderer11DrawEffect.cpp b/TR5Main/Renderer/Renderer11DrawEffect.cpp index f32299957..19281c109 100644 --- a/TR5Main/Renderer/Renderer11DrawEffect.cpp +++ b/TR5Main/Renderer/Renderer11DrawEffect.cpp @@ -20,7 +20,7 @@ #include "particle/SimpleParticle.h" #include "Renderer/RendererSprites.h" #include - +#include "item.h" using namespace TEN::Effects::Lightning; extern BLOOD_STRUCT Blood[MAX_SPARKS_BLOOD]; diff --git a/TR5Main/Renderer/Renderer11Frame.cpp b/TR5Main/Renderer/Renderer11Frame.cpp index 0aaca1d6f..bb6699bc5 100644 --- a/TR5Main/Renderer/Renderer11Frame.cpp +++ b/TR5Main/Renderer/Renderer11Frame.cpp @@ -7,6 +7,7 @@ #include "level.h" #include "setup.h" #include "RenderView\RenderView.h" +#include "item.h" namespace TEN::Renderer { using namespace TEN::Renderer; diff --git a/TR5Main/Renderer/Renderer11Lara.cpp b/TR5Main/Renderer/Renderer11Lara.cpp index 38c1bfdf6..9fad737f6 100644 --- a/TR5Main/Renderer/Renderer11Lara.cpp +++ b/TR5Main/Renderer/Renderer11Lara.cpp @@ -11,7 +11,7 @@ #include "GameFlowScript.h" #include #include "lara_fire.h" - +#include "item.h" using namespace TEN::Renderer; extern GameFlow *g_GameFlow; diff --git a/TR5Main/Scripting/GameScriptItemInfo.cpp b/TR5Main/Scripting/GameScriptItemInfo.cpp index 85a80c4e3..f1bf41d51 100644 --- a/TR5Main/Scripting/GameScriptItemInfo.cpp +++ b/TR5Main/Scripting/GameScriptItemInfo.cpp @@ -11,7 +11,7 @@ #include "GameScriptRotation.h" #include "Specific\trmath.h" #include "lara.h" - +#include "item.h" /*** Represents any object inside the game world. Examples include statics, enemies, doors, diff --git a/TR5Main/Specific/input.cpp b/TR5Main/Specific/input.cpp index 355036c4c..9cb9b2213 100644 --- a/TR5Main/Specific/input.cpp +++ b/TR5Main/Specific/input.cpp @@ -6,7 +6,7 @@ #include "Sound\sound.h" #include "savegame.h" #include "Renderer11.h" - +#include "item.h" using TEN::Renderer::g_Renderer; const char* g_KeyNames[] = { diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 85c0dc6b7..96b0b91c9 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -18,7 +18,7 @@ #include #include #include "Renderer11.h" - +#include "item.h" using TEN::Renderer::g_Renderer; using std::vector; using std::string; diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj index 0475b8955..65c631d86 100644 --- a/TR5Main/TombEngine.vcxproj +++ b/TR5Main/TombEngine.vcxproj @@ -143,6 +143,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" + diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters index f5a81178f..0a859f99f 100644 --- a/TR5Main/TombEngine.vcxproj.filters +++ b/TR5Main/TombEngine.vcxproj.filters @@ -708,6 +708,7 @@ +