diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp index a449b1aca..9b85c6062 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" +#include "items.h" #ifdef NEW_INV #include "newinv2.h" diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index f90c9403b..854473e42 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -14,7 +14,6 @@ #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 23c2a3657..40fae3ea3 100644 --- a/TR5Main/Game/Lara/lara_cheat.cpp +++ b/TR5Main/Game/Lara/lara_cheat.cpp @@ -12,7 +12,6 @@ #include "items.h" #include "setup.h" #include "level.h" -#include "item.h" int NoCheatCounter; diff --git a/TR5Main/Game/Lara/lara_climb.cpp b/TR5Main/Game/Lara/lara_climb.cpp index 32bfcb280..0fa7004c4 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" +#include "items.h" CLIMB_DIRECTION LeftIntRightExtTab[4] = { diff --git a/TR5Main/Game/Lara/lara_collide.cpp b/TR5Main/Game/Lara/lara_collide.cpp index 635b1edca..64e8cf010 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" +#include "items.h" /*this file has all the generic **collision** test functions called in lara's state code*/ diff --git a/TR5Main/Game/Lara/lara_crawl.cpp b/TR5Main/Game/Lara/lara_crawl.cpp index f4186893a..61003484f 100644 --- a/TR5Main/Game/Lara/lara_crawl.cpp +++ b/TR5Main/Game/Lara/lara_crawl.cpp @@ -11,7 +11,6 @@ #include "items.h" #include "camera.h" #include "control/control.h" -#include "item.h" /*this file has all the related functions to ducking and crawling*/ diff --git a/TR5Main/Game/Lara/lara_fire.cpp b/TR5Main/Game/Lara/lara_fire.cpp index 22233566b..e1369ea8c 100644 --- a/TR5Main/Game/Lara/lara_fire.cpp +++ b/TR5Main/Game/Lara/lara_fire.cpp @@ -6,21 +6,20 @@ #include "lara_two_guns.h" #include "camera.h" #include "objects.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "sphere.h" #include "animation.h" -#include "effects\flmtorch.h" +#include "effects/flmtorch.h" #include "level.h" #include "control/lot.h" #include "setup.h" #include "input.h" -#include "Sound\sound.h" -#include "control\los.h" +#include "Sound/sound.h" +#include "control/los.h" #include "savegame.h" #include "GameFlowScript.h" #include "lara_struct.h" #include "itemdata/creature_info.h" -#include "item.h" WEAPON_INFO Weapons[NUM_WEAPONS] = { diff --git a/TR5Main/Game/Lara/lara_flare.cpp b/TR5Main/Game/Lara/lara_flare.cpp index baa7252b8..f32935013 100644 --- a/TR5Main/Game/Lara/lara_flare.cpp +++ b/TR5Main/Game/Lara/lara_flare.cpp @@ -2,17 +2,15 @@ #include "lara_flare.h" #include "level.h" #include "setup.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "animation.h" #include "items.h" -#include "sphere.h" #include "lara_fire.h" #include "Lara.h" #include "collide.h" -#include "effects\effects.h" -#include "effects\chaffFX.h" -#include "Specific\prng.h" -#include "item.h" +#include "effects/effects.h" +#include "effects/chaffFX.h" +#include "Specific/prng.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); diff --git a/TR5Main/Game/Lara/lara_hang.cpp b/TR5Main/Game/Lara/lara_hang.cpp index 156ae4e61..66daa76e8 100644 --- a/TR5Main/Game/Lara/lara_hang.cpp +++ b/TR5Main/Game/Lara/lara_hang.cpp @@ -6,7 +6,6 @@ #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*/ diff --git a/TR5Main/Game/Lara/lara_initialise.cpp b/TR5Main/Game/Lara/lara_initialise.cpp index 06adf5973..8be932438 100644 --- a/TR5Main/Game/Lara/lara_initialise.cpp +++ b/TR5Main/Game/Lara/lara_initialise.cpp @@ -5,7 +5,6 @@ #include "items.h" #include "setup.h" #include "level.h" -#include "item.h" void InitialiseLara(int restore) { diff --git a/TR5Main/Game/Lara/lara_monkey.cpp b/TR5Main/Game/Lara/lara_monkey.cpp index fc4edd4e3..ee76ff0fc 100644 --- a/TR5Main/Game/Lara/lara_monkey.cpp +++ b/TR5Main/Game/Lara/lara_monkey.cpp @@ -9,9 +9,7 @@ #include "collide.h" #include "items.h" #include "camera.h" -#include "control/control.h" #include "level.h" -#include "item.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/Lara/lara_objects.cpp b/TR5Main/Game/Lara/lara_objects.cpp index 777609fba..240a51544 100644 --- a/TR5Main/Game/Lara/lara_objects.cpp +++ b/TR5Main/Game/Lara/lara_objects.cpp @@ -9,7 +9,6 @@ #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.*/ diff --git a/TR5Main/Game/Lara/lara_one_gun.cpp b/TR5Main/Game/Lara/lara_one_gun.cpp index 051f54af8..5e817bfba 100644 --- a/TR5Main/Game/Lara/lara_one_gun.cpp +++ b/TR5Main/Game/Lara/lara_one_gun.cpp @@ -6,28 +6,22 @@ #include "animation.h" #include "control/box.h" #include "control/control.h" -#include "effects\effects.h" -#include "effects\tomb4fx.h" -#include "control/lot.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" #include "collide.h" -#include "effects\debris.h" -#include "effects\weather.h" +#include "effects/debris.h" +#include "effects/weather.h" #include "lara_two_guns.h" -#include "switch.h" #include "objects.h" -#include "sphere.h" -#include "traps.h" #include "camera.h" -#include "GameFlowScript.h" #include "level.h" #include "setup.h" #include "input.h" #include "savegame.h" -#include "Sound\sound.h" -#include "effects\bubble.h" +#include "Sound/sound.h" +#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; diff --git a/TR5Main/Game/Lara/lara_slide.cpp b/TR5Main/Game/Lara/lara_slide.cpp index f5c4b2cd9..05341f9d0 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" +#include "items.h" /*this file has all the related functions to sliding*/ diff --git a/TR5Main/Game/Lara/lara_surface.cpp b/TR5Main/Game/Lara/lara_surface.cpp index cb1f482a5..55c764802 100644 --- a/TR5Main/Game/Lara/lara_surface.cpp +++ b/TR5Main/Game/Lara/lara_surface.cpp @@ -5,13 +5,9 @@ #include "camera.h" #include "collide.h" #include "items.h" -#include "control/box.h" #include "Lara.h" -#include "lara_swim.h" -#include "lara_fire.h" #include "level.h" #include "input.h" -#include "item.h" bool EnableCrawlFlexWaterPullUp, EnableCrawlFlexSubmerged; diff --git a/TR5Main/Game/Lara/lara_swim.cpp b/TR5Main/Game/Lara/lara_swim.cpp index b17c0e488..7ffd95f55 100644 --- a/TR5Main/Game/Lara/lara_swim.cpp +++ b/TR5Main/Game/Lara/lara_swim.cpp @@ -3,18 +3,12 @@ #include "control/control.h" #include "camera.h" #include "items.h" -#include "control/box.h" #include "Lara.h" -#include "lara_surface.h" -#include "effects\effects.h" -#include "lara_fire.h" #include "animation.h" -#include "camera.h" #include "level.h" #include "input.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "GameFlowScript.h" -#include "item.h" struct SUBSUIT_INFO { diff --git a/TR5Main/Game/Lara/lara_tests.cpp b/TR5Main/Game/Lara/lara_tests.cpp index e543b5ee3..8ab78d7ac 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" +#include "items.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/Lara/lara_two_guns.cpp b/TR5Main/Game/Lara/lara_two_guns.cpp index e07ab6988..3783be79f 100644 --- a/TR5Main/Game/Lara/lara_two_guns.cpp +++ b/TR5Main/Game/Lara/lara_two_guns.cpp @@ -12,7 +12,7 @@ #include "Sound\sound.h" #include "savegame.h" #include "Specific\prng.h" -#include "item.h" +#include "items.h" using namespace TEN::Math::Random; struct PISTOL_DEF diff --git a/TR5Main/Game/animation.cpp b/TR5Main/Game/animation.cpp index fe8135585..89b4e45b0 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" +#include "items.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/camera.cpp b/TR5Main/Game/camera.cpp index e182194de..8cbce2384 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" +#include "items.h" using TEN::Renderer::g_Renderer; using namespace TEN::Effects::Environment; diff --git a/TR5Main/Game/camera.h b/TR5Main/Game/camera.h index 453b54214..48989b736 100644 --- a/TR5Main/Game/camera.h +++ b/TR5Main/Game/camera.h @@ -1,7 +1,6 @@ #pragma once -#include "Specific\phd_global.h" +#include "Specific/phd_global.h" #include "items.h" -#include enum CAMERA_TYPE { diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp index a8510e3e3..29fd48761 100644 --- a/TR5Main/Game/collide.cpp +++ b/TR5Main/Game/collide.cpp @@ -1,20 +1,18 @@ #include "framework.h" -#include "control.h" -#include "control\los.h" +#include "control/los.h" #include "collide.h" #include "animation.h" #include "Lara.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "sphere.h" #include "misc.h" #include "setup.h" -#include "Sound\sound.h" -#include "Specific\trmath.h" -#include "Specific\prng.h" +#include "Sound/sound.h" +#include "Specific/trmath.h" +#include "Specific/prng.h" #include "room.h" #include "Renderer11.h" -#include "item.h" using std::vector; using namespace TEN::Math::Random; diff --git a/TR5Main/Game/control/box.cpp b/TR5Main/Game/control/box.cpp index d971aee19..7ff51716d 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" +#include "items.h" #define CHECK_CLICK(x) CLICK(x) / 2 #define ESCAPE_DIST SECTOR(5) diff --git a/TR5Main/Game/control/control.cpp b/TR5Main/Game/control/control.cpp index 320e5f46c..6fad84f0c 100644 --- a/TR5Main/Game/control/control.cpp +++ b/TR5Main/Game/control/control.cpp @@ -46,8 +46,7 @@ #include "Lara/lara_one_gun.h" #include "generic_switch.h" #include "Scripting/GameFlowScript.h" -#include -#include "item.h" +#include "Game/effects/lightning.h" using std::vector; using std::unordered_map; diff --git a/TR5Main/Game/control/los.cpp b/TR5Main/Game/control/los.cpp index 22ae5ba3f..053901fa4 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" +#include "items.h" int NumberLosRooms; short LosRooms[20]; diff --git a/TR5Main/Game/control/lot.cpp b/TR5Main/Game/control/lot.cpp index ec4ca780a..38456ab4a 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" +#include "items.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 07cab54f9..6b6ba2ed0 100644 --- a/TR5Main/Game/control/trigger.cpp +++ b/TR5Main/Game/control/trigger.cpp @@ -6,17 +6,13 @@ #include "objectslist.h" #include "control/box.h" #include "camera.h" -#include "puzzles_keys.h" -#include "pickup.h" #include "control/lot.h" #include "spotcam.h" -#include "Sound\sound.h" -#include "traps.h" +#include "Sound/sound.h" #include "lara.h" -#include "Lara\lara_climb.h" -#include "Objects\Generic\Switches\generic_switch.h" +#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; diff --git a/TR5Main/Game/control/volume.cpp b/TR5Main/Game/control/volume.cpp index 6c76efb42..4cbbb47fd 100644 --- a/TR5Main/Game/control/volume.cpp +++ b/TR5Main/Game/control/volume.cpp @@ -7,7 +7,7 @@ #include "savegame.h" #include "RenderEnums.h" #include "Renderer11.h" -#include "item.h" +#include "items.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/effects/chaffFX.cpp b/TR5Main/Game/effects/chaffFX.cpp index 1ab0e289e..d4ddd750d 100644 --- a/TR5Main/Game/effects/chaffFX.cpp +++ b/TR5Main/Game/effects/chaffFX.cpp @@ -9,7 +9,7 @@ #include "smoke.h" #include "spark.h" #include "Specific\prng.h" -#include "item.h" +#include "items.h" #define MAX_TRIGGER_RANGE 0x4000 using namespace TEN::Math::Random; diff --git a/TR5Main/Game/effects/chaffFX.h b/TR5Main/Game/effects/chaffFX.h index 4e01e432a..6d05ca9f0 100644 --- a/TR5Main/Game/effects/chaffFX.h +++ b/TR5Main/Game/effects/chaffFX.h @@ -1,5 +1,5 @@ #pragma once -#include "Specific\phd_global.h" +#include "Specific/phd_global.h" #include "items.h" void TriggerChaffEffects(int age); diff --git a/TR5Main/Game/effects/effects.cpp b/TR5Main/Game/effects/effects.cpp index c0a6b6bdd..822da4ad3 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" +#include "items.h" using namespace TEN::Effects::Fire; using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/effects/flmtorch.cpp b/TR5Main/Game/effects/flmtorch.cpp index f6c9baab7..d672daa80 100644 --- a/TR5Main/Game/effects/flmtorch.cpp +++ b/TR5Main/Game/effects/flmtorch.cpp @@ -10,7 +10,6 @@ #include "input.h" #include "Sound/sound.h" #include "Objects/Effects/flame_emitters.h" -#include "item.h" using namespace TEN::Entities::Effects; diff --git a/TR5Main/Game/effects/footprint.cpp b/TR5Main/Game/effects/footprint.cpp index 171c53a7c..cf02d1719 100644 --- a/TR5Main/Game/effects/footprint.cpp +++ b/TR5Main/Game/effects/footprint.cpp @@ -2,11 +2,10 @@ #include "control/control.h" #include "lara.h" #include "animation.h" -#include "effects\groundfx.h" -#include "effects\footprint.h" +#include "effects/groundfx.h" +#include "effects/footprint.h" #include "level.h" #include "items.h" -#include "item.h" namespace TEN { namespace Effects { diff --git a/TR5Main/Game/effects/footprint.h b/TR5Main/Game/effects/footprint.h index 15f023093..eb51be281 100644 --- a/TR5Main/Game/effects/footprint.h +++ b/TR5Main/Game/effects/footprint.h @@ -1,7 +1,6 @@ #pragma once -#include "Specific\phd_global.h" -#include "items.h" #include +#include "Specific/phd_global.h" namespace TEN{ namespace Effects { diff --git a/TR5Main/Game/effects/hair.cpp b/TR5Main/Game/effects/hair.cpp index ebcc562b4..6e14ab469 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" +#include "items.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 91561373a..aa3877a99 100644 --- a/TR5Main/Game/effects/lara_burn.cpp +++ b/TR5Main/Game/effects/lara_burn.cpp @@ -5,7 +5,6 @@ #include "Game/effects/lara_burn.h" #include "Game/items.h" #include "Game/control/control.h" -#include "item.h" namespace TEN::Effects::Fire { diff --git a/TR5Main/Game/effects/smoke.cpp b/TR5Main/Game/effects/smoke.cpp index f4459f18c..b3ee523f4 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" +#include "items.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 3640616c8..f62f2f7af 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" +#include "items.h" using std::vector; using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/flipeffect.cpp b/TR5Main/Game/flipeffect.cpp index 6f02cb56a..0128664de 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" +#include "items.h" using std::function; using namespace TEN::Effects::Footprints; diff --git a/TR5Main/Game/floordata.cpp b/TR5Main/Game/floordata.cpp index a0abb36f6..62af79f02 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" +#include "items.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/health.cpp b/TR5Main/Game/health.cpp index f77db6da6..a0ba8d1ad 100644 --- a/TR5Main/Game/health.cpp +++ b/TR5Main/Game/health.cpp @@ -7,7 +7,7 @@ #include "level.h" #include "control/control.h" #include "Renderer11.h" -#include "item.h" +#include "items.h" using namespace TEN::Renderer; short PickupX; diff --git a/TR5Main/Game/item.h b/TR5Main/Game/item.h deleted file mode 100644 index 15b081ae8..000000000 --- a/TR5Main/Game/item.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once -#include -#include "phd_global.h" -#include -#include "itemdata.h" -#include "roomvector.h" - -enum GAME_OBJECT_ID : short; - -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; -}; \ No newline at end of file diff --git a/TR5Main/Game/items.cpp b/TR5Main/Game/items.cpp index 31fc8523d..81c63d3ef 100644 --- a/TR5Main/Game/items.cpp +++ b/TR5Main/Game/items.cpp @@ -6,7 +6,6 @@ #include "control/control.h" #include "floordata.h" #include "effects/effects.h" -#include "item.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/misc.cpp b/TR5Main/Game/misc.cpp index 90118ef29..d7e5c161f 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" +#include "items.h" using std::vector; CREATURE_INFO* GetCreatureInfo(ITEM_INFO* item) diff --git a/TR5Main/Game/missile.cpp b/TR5Main/Game/missile.cpp index 6db0ad7f3..313c88d21 100644 --- a/TR5Main/Game/missile.cpp +++ b/TR5Main/Game/missile.cpp @@ -1,15 +1,13 @@ #include "framework.h" #include "missile.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "animation.h" -#include "effects\debris.h" #include "level.h" #include "setup.h" #include "lara.h" #include "collide.h" -#include "item.h" #define SHARD_DAMAGE 30 #define ROCKET_DAMAGE 100 diff --git a/TR5Main/Game/newinv2.cpp b/TR5Main/Game/newinv2.cpp index c739ecf84..19759f7e7 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" +#include "items.h" using namespace TEN::Renderer; bool goUp, goDown, goRight, goLeft, goSelect, goDeselect; diff --git a/TR5Main/Game/objects.cpp b/TR5Main/Game/objects.cpp index 17590d43f..cf3eadffe 100644 --- a/TR5Main/Game/objects.cpp +++ b/TR5Main/Game/objects.cpp @@ -1,21 +1,16 @@ #include "framework.h" #include "objects.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "animation.h" #include "Lara.h" #include "sphere.h" -#include "effects\debris.h" #include "control/control.h" -#include "switch.h" -#include "control/box.h" #include "setup.h" -#include "effects\tomb4fx.h" #include "level.h" #include "input.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "collide.h" -#include "item.h" OBJECT_TEXTURE* WaterfallTextures[6]; float WaterfallY[6]; diff --git a/TR5Main/Game/particle/SimpleParticle.cpp b/TR5Main/Game/particle/SimpleParticle.cpp index e091a7ad4..a25e552dc 100644 --- a/TR5Main/Game/particle/SimpleParticle.cpp +++ b/TR5Main/Game/particle/SimpleParticle.cpp @@ -1,10 +1,9 @@ #include "framework.h" #include "SimpleParticle.h" #include "items.h" -#include "Specific\trmath.h" -#include -#include "Specific\prng.h" -#include "item.h" +#include "Specific/trmath.h" +#include "Specific/setup.h" +#include "Specific/prng.h" using namespace TEN::Math::Random; diff --git a/TR5Main/Game/people.cpp b/TR5Main/Game/people.cpp index 95d4553e9..d75be445d 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" +#include "items.h" int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage) { diff --git a/TR5Main/Game/pickup/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp index 29b73cba5..9a0821727 100644 --- a/TR5Main/Game/pickup/pickup.cpp +++ b/TR5Main/Game/pickup/pickup.cpp @@ -28,7 +28,6 @@ #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 { diff --git a/TR5Main/Game/pickup/pickup_misc_items.cpp b/TR5Main/Game/pickup/pickup_misc_items.cpp index 5e54ddee0..76e5a3d02 100644 --- a/TR5Main/Game/pickup/pickup_misc_items.cpp +++ b/TR5Main/Game/pickup/pickup_misc_items.cpp @@ -1,7 +1,7 @@ #include "framework.h" +#include #include "pickup_misc_items.h" #include "objectslist.h" -#include #include "lara_struct.h" #include "pickuputil.h" diff --git a/TR5Main/Game/puzzles_keys.cpp b/TR5Main/Game/puzzles_keys.cpp index 6e2496038..80e89bf8d 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" +#include "items.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Game/room.cpp b/TR5Main/Game/room.cpp index d1cfddda5..73ee4cf76 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" +#include "items.h" using namespace TEN::Renderer; diff --git a/TR5Main/Game/rope.cpp b/TR5Main/Game/rope.cpp index aa49d7199..6c2c50c8b 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" +#include "items.h" PENDULUM CurrentPendulum; PENDULUM AlternatePendulum; diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index c9ebf1ee1..e41f2f734 100644 --- a/TR5Main/Game/savegame.cpp +++ b/TR5Main/Game/savegame.cpp @@ -17,7 +17,6 @@ #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 8950fee5a..d5a85496e 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" +#include "items.h" using namespace TEN::Renderer; diff --git a/TR5Main/Game/spotcam.cpp b/TR5Main/Game/spotcam.cpp index ff6adb613..3e0eb7754 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" +#include "items.h" using namespace TEN::Renderer; using namespace TEN::Control::Volumes; diff --git a/TR5Main/Game/switch.cpp b/TR5Main/Game/switch.cpp index d99ce50f9..251eac8cf 100644 --- a/TR5Main/Game/switch.cpp +++ b/TR5Main/Game/switch.cpp @@ -16,7 +16,6 @@ #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 diff --git a/TR5Main/Game/traps.cpp b/TR5Main/Game/traps.cpp index 4ed3c8108..aa2d0426c 100644 --- a/TR5Main/Game/traps.cpp +++ b/TR5Main/Game/traps.cpp @@ -14,8 +14,6 @@ #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 0e2fe9eb5..2abc0a33c 100644 --- a/TR5Main/Objects/Effects/flame_emitters.cpp +++ b/TR5Main/Objects/Effects/flame_emitters.cpp @@ -8,12 +8,12 @@ #include "effects/tomb4fx.h" #include "collide.h" #include "animation.h" -#include -#include -#include -#include +#include "Game/effects/effects.h" +#include "weather.h" +#include "Specific/setup.h" +#include "Game/effects/lightning.h" #include "Game/effects/lara_burn.h" -#include "item.h" +#include "items.h" using namespace TEN::Effects::Fire; using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Objects/Effects/tr4_bubbles.cpp b/TR5Main/Objects/Effects/tr4_bubbles.cpp index a66c242b9..d02c74ced 100644 --- a/TR5Main/Objects/Effects/tr4_bubbles.cpp +++ b/TR5Main/Objects/Effects/tr4_bubbles.cpp @@ -1,18 +1,15 @@ #include "framework.h" #include "tr4_bubbles.h" -#include "effects\debris.h" +#include "effects/debris.h" #include "items.h" -#include "traps.h" -#include "animation.h" -#include "effects\tomb4fx.h" -#include "effects\effects.h" +#include "effects/tomb4fx.h" +#include "effects/effects.h" #include "level.h" #include "lara.h" #include "control/control.h" #include "tr4_mutant.h" #include "collide.h" #include "Game/effects/lara_burn.h" -#include "item.h" using namespace TEN::Effects::Fire; diff --git a/TR5Main/Objects/Effects/tr4_locusts.cpp b/TR5Main/Objects/Effects/tr4_locusts.cpp index 98d63a582..fc5671fb2 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/Effects/tr5_electricity.cpp b/TR5Main/Objects/Effects/tr5_electricity.cpp index bfbe378ff..a5ed6e03b 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" +#include "items.h" using namespace TEN::Effects::Fire; diff --git a/TR5Main/Objects/Generic/Doors/double_doors.cpp b/TR5Main/Objects/Generic/Doors/double_doors.cpp index 0782ee3b9..89ef1cd9b 100644 --- a/TR5Main/Objects/Generic/Doors/double_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/double_doors.cpp @@ -17,7 +17,6 @@ #include "misc.h" #include "double_doors.h" #include "collide.h" -#include "item.h" namespace TEN::Entities::Doors { diff --git a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp index 0e90ee37c..bc9085821 100644 --- a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp +++ b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp @@ -18,7 +18,6 @@ #include "pushpull_kick_door.h" #include "collide.h" #include "itemdata/door_data.h" -#include "item.h" namespace TEN::Entities::Doors { diff --git a/TR5Main/Objects/Generic/Doors/sequence_door.cpp b/TR5Main/Objects/Generic/Doors/sequence_door.cpp index 72acecaa0..3fac743ef 100644 --- a/TR5Main/Objects/Generic/Doors/sequence_door.cpp +++ b/TR5Main/Objects/Generic/Doors/sequence_door.cpp @@ -18,7 +18,6 @@ #include "sequence_door.h" #include "fullblock_switch.h" #include "itemdata/door_data.h" -#include "item.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/Generic/Doors/steel_door.cpp b/TR5Main/Objects/Generic/Doors/steel_door.cpp index 49aea2e60..0dfe44608 100644 --- a/TR5Main/Objects/Generic/Doors/steel_door.cpp +++ b/TR5Main/Objects/Generic/Doors/steel_door.cpp @@ -17,7 +17,6 @@ #include "misc.h" #include "steel_door.h" #include "collide.h" -#include "item.h" namespace TEN::Entities::Doors { diff --git a/TR5Main/Objects/Generic/Doors/underwater_door.cpp b/TR5Main/Objects/Generic/Doors/underwater_door.cpp index 7b6d978eb..50b57d382 100644 --- a/TR5Main/Objects/Generic/Doors/underwater_door.cpp +++ b/TR5Main/Objects/Generic/Doors/underwater_door.cpp @@ -17,8 +17,6 @@ #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 33b39d64f..a014c0ca7 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" +#include "items.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 91798e86a..1474f4543 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" +#include "items.h" OBJECT_COLLISION_BOUNDS CeilingTrapDoorBounds = {-256, 256, 0, 900, -768, -256, -1820, 1820, -5460, 5460, -1820, 1820}; static PHD_VECTOR CeilingTrapDoorPos = {0, 1056, -480}; diff --git a/TR5Main/Objects/Generic/Switches/cog_switch.cpp b/TR5Main/Objects/Generic/Switches/cog_switch.cpp index aab67f2d0..457511cc0 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" +#include "items.h" using namespace TEN::Entities::Doors; diff --git a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp index 3b0f98edd..3cf065e45 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp b/TR5Main/Objects/Generic/Switches/fullblock_switch.cpp index df70bf36f..2a83d0310 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/generic_switch.cpp b/TR5Main/Objects/Generic/Switches/generic_switch.cpp index 0ce54359e..8f5e2f4de 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/jump_switch.cpp b/TR5Main/Objects/Generic/Switches/jump_switch.cpp index c92d86020..d91eb36dd 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp index 59edf893a..e85fc35ac 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/rail_switch.cpp b/TR5Main/Objects/Generic/Switches/rail_switch.cpp index e1605bebc..e3a964637 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" +#include "items.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/turn_switch.cpp b/TR5Main/Objects/Generic/Switches/turn_switch.cpp index 5c9204888..092bab5e6 100644 --- a/TR5Main/Objects/Generic/Switches/turn_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/turn_switch.cpp @@ -9,7 +9,7 @@ #include "level.h" #include "collide.h" #include "animation.h" -#include "item.h" +#include "items.h" namespace TEN::Entities::Switches diff --git a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp index 040ffbe01..cbfef1e56 100644 --- a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp @@ -7,7 +7,7 @@ #include "collide.h" #include "level.h" #include "animation.h" -#include "item.h" +#include "items.h" namespace TEN::Entities::Switches diff --git a/TR5Main/Objects/Generic/Traps/dart_emitter.cpp b/TR5Main/Objects/Generic/Traps/dart_emitter.cpp index b371a89dc..2b33fbce6 100644 --- a/TR5Main/Objects/Generic/Traps/dart_emitter.cpp +++ b/TR5Main/Objects/Generic/Traps/dart_emitter.cpp @@ -2,10 +2,9 @@ #include "Objects/Generic/Traps/dart_emitter.h" #include "level.h" #include "lara.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "items.h" -#include "Sound\sound.h" -#include "item.h" +#include "Sound/sound.h" namespace TEN::Entities::Traps { diff --git a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp index ca9f09992..bc233accd 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" +#include "items.h" BITE_INFO apeBite = { 0, -19, 75, 15 }; diff --git a/TR5Main/Objects/TR1/Entity/tr1_bear.cpp b/TR5Main/Objects/TR1/Entity/tr1_bear.cpp index 95f377fa7..408ce66b0 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" +#include "items.h" BITE_INFO bearBite = { 0, 96, 335, 14 }; diff --git a/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp b/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp index 7f8571349..ab075ec2f 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" +#include "items.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 1f5431984..d3dcdd611 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp @@ -7,7 +7,6 @@ #include "lara.h" #include "control/control.h" #include "animation.h" -#include "item.h" // TODO: Evil lara is not targetable and cant move like lara. diff --git a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp index 97d184605..467dd8254 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp @@ -10,7 +10,6 @@ #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, diff --git a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp index 8dacfa111..195fe838f 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp @@ -5,11 +5,10 @@ #include "items.h" #include "missile.h" #include "level.h" -#include "Sound\sound.h" -#include "effects\effects.h" -#include "Specific\trmath.h" +#include "Sound/sound.h" +#include "effects/effects.h" +#include "Specific/trmath.h" #include "itemdata/creature_info.h" -#include "item.h" #define NATLA_NEAR_DEATH 200 diff --git a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp index a09f8cd9c..ba8c8b1b7 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp @@ -2,14 +2,12 @@ #include "tr1_wolf.h" #include "items.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "lara.h" #include "setup.h" #include "control/control.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control/control.h" -#include "item.h" BITE_INFO wolfBite = { 0, -14, 174, 6 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp index 1fc313999..f2daa0be7 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "item.h" +#include "items.h" BITE_INFO barracudaBite = { 2, -60, 121, 7 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp b/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp index c6319dcdc..9d9b4bd3b 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" +#include "items.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 e6db12570..3ec105630 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp @@ -14,7 +14,6 @@ #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 diff --git a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp index d060a7c6d..fb7f5f619 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp @@ -1,13 +1,12 @@ #include "framework.h" #include "tr2_eagle_or_crow.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "lara.h" #include "items.h" #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 15e82f36f..0900b1a8e 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp @@ -1,17 +1,16 @@ #include "framework.h" #include "tr2_knifethrower.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "control/box.h" #include "people.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #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 f64f6f00d..c75b5d5da 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" +#include "items.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 6960fe6df..a9416e851 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "item.h" +#include "items.h" BITE_INFO monkBite = { -23,16,265, 14 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp b/TR5Main/Objects/TR2/Entity/tr2_rat.cpp index beb833f37..641e6f6c2 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" +#include "items.h" BITE_INFO ratBite = { 0, 0, 57, 2 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_shark.cpp b/TR5Main/Objects/TR2/Entity/tr2_shark.cpp index a12a1cb6c..6c8b97cc3 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" +#include "items.h" BITE_INFO sharkBite = { 17, -22, 344, 12 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp b/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp index 91ebaa31c..be6b17c15 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp @@ -6,7 +6,7 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" -#include "item.h" +#include "items.h" BITE_INFO silencerGun = { 3, 331, 56, 10 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp index 35df1dbbf..aa4592a25 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp @@ -14,8 +14,6 @@ #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 29bc0364b..f1d5536ad 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp @@ -9,7 +9,6 @@ #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 65a7d3d71..a0cdaab18 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spider.cpp @@ -11,7 +11,6 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" -#include "item.h" BITE_INFO spiderBite = { 0, 0, 41, 1 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp index c7fa34248..1fdcfcc94 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp @@ -10,7 +10,6 @@ #include "lara.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO swordBite = { 0, 37, 550, 15 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp index 61a29b893..040db5e5f 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" +#include "items.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 afef9b5fd..bff2a8522 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp @@ -13,7 +13,6 @@ #include "effects/effects.h" #include "Specific/trmath.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO workerFlameThrower = { 0, 250, 32, 9 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp index d39fb21c6..ba16a6f8c 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp @@ -8,7 +8,6 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO workerMachineGun = { 0, 308, 32, 9 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp index 97302afa3..bf1b0aba6 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp @@ -8,7 +8,6 @@ #include "level.h" #include "control/control.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO workerShotgun = { 0, 281, 40, 9 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp index a9c6f8617..74004778c 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp @@ -8,7 +8,6 @@ #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 c6bf37f18..757ba1a03 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" +#include "items.h" void InitialiseKillerStatue(short itemNumber) { diff --git a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp index 97a969df5..f329c87c7 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp @@ -8,7 +8,6 @@ #include "Sound/sound.h" #include "items.h" #include "animation.h" -#include "item.h" void InitialiseSpinningBlade(short itemNumber) { diff --git a/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp b/TR5Main/Objects/TR2/Trap/tr2_springboard.cpp index b143066d3..58963d42c 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" +#include "items.h" void SpringBoardControl(short itemNumber) { diff --git a/TR5Main/Objects/TR2/Vehicles/boat.cpp b/TR5Main/Objects/TR2/Vehicles/boat.cpp index b6db3cb17..2bf84d0c8 100644 --- a/TR5Main/Objects/TR2/Vehicles/boat.cpp +++ b/TR5Main/Objects/TR2/Vehicles/boat.cpp @@ -13,7 +13,6 @@ #include "effects/effects.h" #include "particle/SimpleParticle.h" #include "boat_info.h" -#include "item.h" enum BOAT_STATE { diff --git a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp index d09cc4daa..80aed8d95 100644 --- a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp +++ b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp @@ -18,7 +18,6 @@ #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 1084adbe6..3dea1ed74 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" +#include "items.h" BITE_INFO civvy_hit = { 0,0,0, 13 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp index f6b48a588..c713166c7 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp @@ -1,13 +1,12 @@ #include "framework.h" #include "tr3_cobra.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "items.h" #include "lara.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO cobraBite = { 0, 0, 0, 13 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp index ec8733212..c4c21a745 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" +#include "items.h" #define PIRAHNA_DAMAGE 4 #define X 0 diff --git a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp index e03eedd8d..a89438c1b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp @@ -1,8 +1,7 @@ #include "framework.h" #include "tr3_flamethrower.h" #include "control/box.h" -#include "sphere.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "people.h" #include "items.h" #include "animation.h" @@ -10,9 +9,8 @@ #include "control/lot.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO flamerBite = { 0, 340, 64, 7 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp index 42f621183..f772c06e4 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp @@ -2,14 +2,13 @@ #include "tr3_monkey.h" #include "control/box.h" #include "lara.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "items.h" #include "setup.h" #include "control/lot.h" #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" BITE_INFO monkeyBite = { 10, 10, 11, 13 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp index dde6fdbed..f5037553e 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" +#include "items.h" enum MPGUN_STATES { diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp index 242c6e1bc..a1358a5f0 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp @@ -1,16 +1,15 @@ #include "framework.h" #include "tr3_mpstick.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "people.h" #include "items.h" #include "setup.h" #include "control/lot.h" #include "level.h" #include "lara.h" -#include "Sound\sound.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 e4275507e..427c7697b 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" +#include "items.h" static BITE_INFO raptorBite = { 0, 66, 318, 22 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp index 84a87798b..1c842ba3e 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp @@ -7,9 +7,8 @@ #include "level.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "control\los.h" -#include "effects\effects.h" -#include "item.h" +#include "control/los.h" +#include "effects/effects.h" BITE_INFO scubaGun = { 17, 164, 44, 18 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index fdf30be6c..584bbcdf6 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp @@ -7,10 +7,8 @@ #include "setup.h" #include "level.h" #include "lara.h" -#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 5ad22dd79..160d40fba 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp @@ -1,19 +1,12 @@ #include "framework.h" #include "tr3_sophia.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "control/lot.h" #include "boss.h" -#include "control/box.h" -#include "sphere.h" -#include "people.h" #include "animation.h" -#include "misc.h" -#include "setup.h" #include "level.h" -#include "lara.h" -#include "Sound\sound.h" -#include "item.h" +#include "Sound/sound.h" static BOSS_STRUCT BossData; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp index 1dcbda01f..c65ddee59 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" +#include "items.h" BITE_INFO tigerBite = { 19, -13, 3, 26 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp index cbd19da2e..e5624a758 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp @@ -1,7 +1,6 @@ #include "framework.h" #include "tr3_tony.h" -#include "effects\effects.h" -#include "sphere.h" +#include "effects/effects.h" #include "items.h" #include "control/lot.h" #include "boss.h" @@ -10,12 +9,10 @@ #include "level.h" #include "setup.h" #include "lara.h" -#include "traps.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" #include "collide.h" #include "Game/effects/lara_burn.h" -#include "item.h" using namespace TEN::Effects::Fire; diff --git a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp index fa7093a00..2914092c1 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp @@ -8,8 +8,6 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" - void LaraTyrannosaurDeath(ITEM_INFO* item) { diff --git a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp index cd8fbd473..ace990c4b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp @@ -11,8 +11,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include -#include "item.h" +#include "Objects/Generic/Traps/dart_emitter.h" using namespace TEN::Entities::Traps; diff --git a/TR5Main/Objects/TR3/Trap/train.cpp b/TR5Main/Objects/TR3/Trap/train.cpp index bc5b1e9fc..73d4d8aab 100644 --- a/TR5Main/Objects/TR3/Trap/train.cpp +++ b/TR5Main/Objects/TR3/Trap/train.cpp @@ -10,8 +10,6 @@ #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 4e0db5fb7..3a6bd9c8d 100644 --- a/TR5Main/Objects/TR3/Vehicles/biggun.cpp +++ b/TR5Main/Objects/TR3/Vehicles/biggun.cpp @@ -6,16 +6,14 @@ #include "input.h" #include "lara.h" #include "lara_flare.h" -#include "Sound\sound.h" -#include "sphere.h" -#include "effects\effects.h" +#include "Sound/sound.h" +#include "effects/effects.h" #include "lara_struct.h" -#include "effects\tomb4fx.h" +#include "effects/tomb4fx.h" #include "animation.h" #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 2bd368d6a..023165d93 100644 --- a/TR5Main/Objects/TR3/Vehicles/kayak.cpp +++ b/TR5Main/Objects/TR3/Vehicles/kayak.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "kayak.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "animation.h" #include "camera.h" #include "Lara.h" @@ -12,7 +12,6 @@ #include "input.h" #include "control/control.h" #include "kayak_info.h" -#include "item.h" using std::vector; diff --git a/TR5Main/Objects/TR3/Vehicles/minecart.cpp b/TR5Main/Objects/TR3/Vehicles/minecart.cpp index 430806e91..e4e6c8103 100644 --- a/TR5Main/Objects/TR3/Vehicles/minecart.cpp +++ b/TR5Main/Objects/TR3/Vehicles/minecart.cpp @@ -2,19 +2,17 @@ #include "minecart.h" #include "lara.h" #include "collide.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "lara_flare.h" #include "items.h" #include "sphere.h" #include "animation.h" -#include "misc.h" #include "camera.h" #include "level.h" #include "setup.h" #include "input.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "minecart_info.h" -#include "item.h" using std::vector; diff --git a/TR5Main/Objects/TR3/Vehicles/quad.cpp b/TR5Main/Objects/TR3/Vehicles/quad.cpp index 5fe5745b2..3b57e7d21 100644 --- a/TR5Main/Objects/TR3/Vehicles/quad.cpp +++ b/TR5Main/Objects/TR3/Vehicles/quad.cpp @@ -16,7 +16,6 @@ #include "Sound/sound.h" #include "Specific/prng.h" #include "quad_info.h" -#include "item.h" using std::vector; using namespace TEN::Math::Random; diff --git a/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp b/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp index d19d4d6f0..26cf23d1d 100644 --- a/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp +++ b/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp @@ -6,13 +6,12 @@ #include "lara.h" #include "input.h" #include "sphere.h" -#include "Sound\sound.h" -#include "effects\bubble.h" +#include "Sound/sound.h" +#include "effects/bubble.h" #include "animation.h" #include "camera.h" #include "setup.h" #include "rubberboat_info.h" -#include "item.h" #define RUBBER_BOAT_FRONT 750 #define RUBBER_BOAT_SIDE 300 diff --git a/TR5Main/Objects/TR3/Vehicles/upv.cpp b/TR5Main/Objects/TR3/Vehicles/upv.cpp index b653f2510..6c69d88c8 100644 --- a/TR5Main/Objects/TR3/Vehicles/upv.cpp +++ b/TR5Main/Objects/TR3/Vehicles/upv.cpp @@ -3,24 +3,20 @@ #include "lara.h" #include "items.h" #include "sphere.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "collide.h" #include "control/box.h" -#include "lara_flare.h" +#include "lara_flare.h"c #include "animation.h" -#include "effects\tomb4fx.h" -#include "misc.h" #include "camera.h" #include "setup.h" -#include "effects\bubble.h" +#include "effects/bubble.h" #include "level.h" #include "input.h" #include "savegame.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "upv_info.h" -#include "control\los.h" -#include "item.h" - +#include "control/los.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 4e63e7a61..94324048b 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp @@ -2,9 +2,9 @@ #include "tr4_ahmet.h" #include "control/control.h" #include "sphere.h" -#include "effects\effects.h" -#include "effects\weather.h" -#include "Sound\sound.h" +#include "effects/effects.h" +#include "effects/weather.h" +#include "Sound/sound.h" #include "setup.h" #include "control/box.h" #include "level.h" @@ -14,7 +14,6 @@ #include "items.h" #include "control/lot.h" #include "itemdata/creature_info.h" -#include "item.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp index 26c5cebcf..dcbfc3bc5 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" +#include "items.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 9baee6a20..0ee992328 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp @@ -11,7 +11,6 @@ #include "animation.h" #include "control/lot.h" #include "itemdata/creature_info.h" -#include "item.h" /* ID_BADDY_1 diff --git a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp index 809d9b988..b611ac101 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp @@ -9,7 +9,7 @@ #include "setup.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" -#include "item.h" +#include "items.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 fa0e33153..3f0bf6d16 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp @@ -1,17 +1,14 @@ #include "framework.h" #include "tr4_big_beetle.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "level.h" #include "control/control.h" -#include "Specific\trmath.h" -#include -#include "Sound\sound.h" -#include -#include +#include "Specific/trmath.h" +#include "lara.h" +#include "people.h" #include "itemdata/creature_info.h" -#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp index fd1af9726..a116559a3 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_bigscorpion.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "items.h" #include "setup.h" #include "control/lot.h" @@ -9,7 +9,6 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" int CutSeqNum; diff --git a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp index 0a4f1c848..9fd6e05a9 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_crocodile.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "people.h" #include "items.h" #include "setup.h" @@ -12,8 +12,6 @@ #include "misc.h" #include "itemdata/creature_info.h" #include "collide.h" -#include "control/control.h" -#include "item.h" enum CROCODILE_STATE { diff --git a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp index 45192abca..11963e1bc 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp @@ -3,17 +3,15 @@ #include "items.h" #include "control/box.h" #include "people.h" -#include "sphere.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "animation.h" -#include "effects\tomb4fx.h" +#include "effects/tomb4fx.h" #include "camera.h" #include "setup.h" #include "level.h" #include "lara.h" #include "control/control.h" #include "itemdata/creature_info.h" -#include "item.h" extern SMOKE_SPARKS SmokeSparks[MAX_SPARKS_SMOKE]; diff --git a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp index 55a6a71f6..a2ff541d5 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr4_dog.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp index ddbf40c6a..3e7f12945 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp @@ -6,7 +6,6 @@ #include "Specific/trmath.h" #include "control/control.h" #include "lara.h" -#include "sphere.h" #include "control/lot.h" #include "Sound/sound.h" #include "animation.h" @@ -15,7 +14,6 @@ #include "control/trigger.h" #include "effects/effects.h" #include "effects/tomb4fx.h" -#include "item.h" ITEM_INFO jeepDummyTarget; diff --git a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp index d682896c8..e7c5e2ae0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp @@ -11,7 +11,6 @@ #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 diff --git a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp index e81b99332..63a3e5563 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp @@ -1,17 +1,13 @@ #include "framework.h" #include "tr4_hammerhead.h" #include "control/box.h" -#include "effects\effects.h" -#include "people.h" +#include "effects/effects.h" #include "items.h" #include "setup.h" #include "level.h" #include "lara.h" #include "animation.h" -#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 diff --git a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp index cb8d4d98a..d9b4ef5c9 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp @@ -2,9 +2,8 @@ #include "tr4_harpy.h" #include "people.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "items.h" -#include "sphere.h" #include "animation.h" #include "setup.h" #include "control/lot.h" @@ -12,7 +11,6 @@ #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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp index ad8c6cf0e..9b63f1223 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp @@ -11,7 +11,6 @@ #include "sphere.h" #include "control/box.h" #include "animation.h" -#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp b/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp index 1a8521fc5..14119c44b 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" +#include "items.h" void InitialiseJeanYves(short itemNumber) { diff --git a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp index 2e50ba518..2ff8930a0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp @@ -10,7 +10,6 @@ #include "animation.h" #include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO knightTemplarBite = { 0, 0, 0, 11 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp index bde267bcb..8e6d1c03a 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp index a386123a8..acd364fa1 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp @@ -3,14 +3,11 @@ #include "items.h" #include "lara.h" #include "control/box.h" -#include "lara.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "control/control.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control/control.h" -#include "item.h" enum MUMMY_STATES { STATE_MUMMY_ARMS_CROSSED = 0, diff --git a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp index 44e552d93..c5971d574 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp index 0aca82229..caf3e5435 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp @@ -13,7 +13,6 @@ #include "Specific/input.h" #include "Lara/lara_one_gun.h" #include "itemdata/creature_info.h" -#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp index 59bb54021..75da972e4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp @@ -17,7 +17,6 @@ #include "objectslist.h" #include "itemdata/creature_info.h" #include "animation.h" -#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp index 57b8d5fe6..b1f286838 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp @@ -10,7 +10,6 @@ #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 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp index e813db295..94e87e6d5 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp @@ -15,7 +15,6 @@ #include "itemdata/creature_info.h" #include "floordata.h" #include "collide.h" -#include "item.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp index 50d783d0a..af7c93581 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp @@ -2,13 +2,12 @@ #include "tr4_smallscorpion.h" #include "control/box.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "level.h" #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 2269766b4..33c99e726 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp @@ -1,15 +1,14 @@ #include "framework.h" #include "tr4_sphinx.h" -#include "effects\debris.h" +#include "effects/debris.h" #include "items.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" enum SPHIX_STATES { SPHINX_EMPTY, diff --git a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp index c38094410..13c8b873a 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp @@ -2,8 +2,7 @@ #include "tr4_troops.h" #include "control/box.h" #include "items.h" -#include "sphere.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "lara.h" #include "people.h" #include "setup.h" @@ -12,7 +11,6 @@ #include "itemdata/creature_info.h" #include "control/control.h" #include "animation.h" -#include "item.h" BITE_INFO TroopsBite1 = { 0, 300, 64, 7 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp index 04a907a27..5756fd163 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp @@ -10,7 +10,6 @@ #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 diff --git a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp index b1e68c1e3..6b99c0870 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp @@ -2,14 +2,13 @@ #include "tr4_wildboar.h" #include "control/box.h" #include "items.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "control/lot.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" BITE_INFO wildboardBiteInfo = { 0, 0, 0, 14 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp index 9b32e376a..cdcf34b82 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" +#include "items.h" using namespace TEN::Effects::Fire; diff --git a/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp b/TR5Main/Objects/TR4/Floor/tr4_burningfloor.cpp index abd73bfff..793a99ca3 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" +#include "items.h" void InitialiseBurningFloor(short itemNum) { diff --git a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp index 32da32e1b..4fb0953f4 100644 --- a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp @@ -4,9 +4,8 @@ #include "level.h" #include "lara.h" #include "animation.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "collide.h" -#include "item.h" void ClockworkBeetleControl(short item_number) { diff --git a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp index c3a62d191..175d59b64 100644 --- a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp @@ -2,17 +2,16 @@ #include "tr4_element_puzzle.h" #include "level.h" #include "control/control.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "animation.h" -#include -#include -#include -#include -#include -#include +#include "lara.h" +#include "sphere.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" +#include "input.h" #include "generic_switch.h" #include "collide.h" -#include "item.h" +#include "items.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp index 08ae25021..f1fc2dee6 100644 --- a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp @@ -6,7 +6,6 @@ #include "control/box.h" #include "lara.h" #include "animation.h" -#include "item.h" void InitialiseLaraDouble(short itemNum) { diff --git a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp index 2562f133a..a46482887 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp index 3ac61ce52..3312d4d9f 100644 --- a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp @@ -7,11 +7,9 @@ #include "Sound/sound.h" #include "lara.h" #include "effects/effects.h" -#include "effects/tomb4fx.h" #include "input.h" #include "animation.h" -#include -#include "item.h" +#include "Game/effects/lightning.h" using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp index 6790d21d9..a0e1e45fd 100644 --- a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp @@ -7,7 +7,6 @@ #include "pickup.h" #include "setup.h" #include "health.h" -#include "item.h" OBJECT_COLLISION_BOUNDS SarcophagusBounds = { diff --git a/TR5Main/Objects/TR4/Object/tr4_scales.cpp b/TR5Main/Objects/TR4/Object/tr4_scales.cpp index 583a1ff63..f15a94d84 100644 --- a/TR5Main/Objects/TR4/Object/tr4_scales.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_scales.cpp @@ -5,13 +5,11 @@ #include "setup.h" #include "items.h" #include "lara.h" -#include "switch.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "animation.h" -#include "effects\tomb4fx.h" +#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 0cf497562..5af50e6da 100644 --- a/TR5Main/Objects/TR4/Object/tr4_senet.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_senet.cpp @@ -1,16 +1,15 @@ #include "framework.h" #include "tr4_senet.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "items.h" #include "control/control.h" #include "setup.h" -#include "effects\tomb4fx.h" +#include "effects/tomb4fx.h" #include "lara.h" #include "lara_struct.h" #include "input.h" #include "level.h" #include "collide.h" -#include "item.h" short SenetPiecesNumber[6]; char SenetDisplacement, ActiveSenetPieces[6], SenetBoard[17]; diff --git a/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp index e4aa82dc8..97d8ba3bc 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp index 42f406636..c91ffd2fc 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp @@ -4,8 +4,8 @@ #include "collide.h" #include "lara.h" #include "control/control.h" -#include "effects\effects.h" -#include "item.h" +#include "effects/effects.h" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp index 741bb6846..173a8b023 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_chain.cpp b/TR5Main/Objects/TR4/Trap/tr4_chain.cpp index 3a5dd9010..81183c005 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp index 668f43431..b59375660 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp b/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp index 0f1fa2a79..e1654d9cf 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp index 186a6aec3..5e5d31c39 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp index 46d404e5e..0824ea901 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp @@ -2,14 +2,13 @@ #include "tr4_mine.h" #include "level.h" #include "sphere.h" -#include "Sound\sound.h" -#include "effects\effects.h" -#include "effects\tomb4fx.h" -#include "effects\weather.h" +#include "Sound/sound.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" +#include "effects/weather.h" #include "items.h" #include "collide.h" #include "objectslist.h" -#include "item.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp index 15dcd6b65..263f5d6b2 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp index a5d40c606..d6b837df6 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_plough.cpp b/TR5Main/Objects/TR4/Trap/tr4_plough.cpp index a02bf80b7..ab4a75d91 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp index 0a6a21178..214573a4a 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp index a706e3590..f622140ab 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp @@ -1,11 +1,10 @@ #include "framework.h" #include "tr4_slicerdicer.h" #include "level.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "items.h" #include "animation.h" -#include "Specific\trmath.h" -#include "item.h" +#include "Specific/trmath.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp index 2ed5aa021..4063c1256 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp index 818778423..511eea568 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp @@ -7,7 +7,6 @@ #include "lara.h" #include "effects/effects.h" #include "animation.h" -#include "item.h" void ControlSpikyCeiling(short itemNumber) { diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp index a757ed9cf..764ae1c2a 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp @@ -2,11 +2,10 @@ #include "tr4_spikywall.h" #include "level.h" #include "control/control.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "lara.h" #include "items.h" -#include "effects\effects.h" -#include "item.h" +#include "effects/effects.h" void ControlSpikyWall(short itemNum) { diff --git a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp index c27a8f92e..81a7264ea 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp b/TR5Main/Objects/TR4/Trap/tr4_teethspike.cpp index 12f725196..fb62e706e 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" +#include "items.h" namespace TEN::Entities::TR4 { diff --git a/TR5Main/Objects/TR4/Vehicles/jeep.cpp b/TR5Main/Objects/TR4/Vehicles/jeep.cpp index ba809e959..afad1e512 100644 --- a/TR5Main/Objects/TR4/Vehicles/jeep.cpp +++ b/TR5Main/Objects/TR4/Vehicles/jeep.cpp @@ -19,7 +19,6 @@ #include "level.h" #include "animation.h" #include "jeep_info.h" -#include "item.h" using std::vector; diff --git a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp index f6a771f07..91518c5b7 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" +#include "items.h" using namespace TEN::Math::Random; diff --git a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp index 8ecaa145d..2499490f6 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" +#include "items.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 eaa76c66c..3855d4d7c 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp @@ -8,7 +8,7 @@ #include "effects\tomb4fx.h" #include "Sound\sound.h" #include "lara.h" -#include "item.h" +#include "items.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 253ac97e7..eb36f7c8d 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp @@ -3,8 +3,7 @@ #include "objectslist.h" #include "items.h" #include "level.h" -#include "Specific\trmath.h" -#include "item.h" +#include "Specific/trmath.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 9b6640a63..40529dacb 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp @@ -8,7 +8,7 @@ #include "effects\tomb4fx.h" #include "Sound\sound.h" #include "lara.h" -#include "item.h" +#include "items.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 ba0e25b05..45b05d8fd 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" +#include "items.h" void InitialiseAutoGuns(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp index 84f8cbe9f..1cdb9b61f 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp @@ -2,14 +2,13 @@ #include "tr5_brownbeast.h" #include "items.h" #include "control/box.h" -#include "effects\effects.h" -#include "effects\tomb4fx.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.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 376d9c193..183bb2fd4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp @@ -2,17 +2,14 @@ #include "tr5_chef.h" #include "items.h" #include "control/box.h" -#include "sphere.h" -#include "effects\debris.h" -#include "effects\effects.h" -#include "effects\tomb4fx.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" #include "people.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" #define STATE_CHEF_COOKING 1 #define STATE_CHEF_TURN_180 2 diff --git a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp index 917497f4a..0932dc487 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp @@ -1,21 +1,18 @@ #include "framework.h" #include "tr5_cyborg.h" #include "items.h" -#include "sphere.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "people.h" #include "animation.h" -#include "effects\tomb4fx.h" +#include "effects/tomb4fx.h" #include "lara.h" -#include "traps.h" #include "setup.h" #include "level.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #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 76b35b1b3..d418405ad 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" +#include "items.h" BITE_INFO DobermanBite = { 0, 0x1E, 0x8D, 0x14 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp b/TR5Main/Objects/TR5/Entity/tr5_dog.cpp index 01391eb72..a5dc7008b 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" +#include "items.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 1c782d61f..6dfe8b912 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp @@ -2,13 +2,12 @@ #include "tr5_ghost.h" #include "items.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" BITE_INFO InvisibleGhostBite = { 0, 0, 0, 17 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp index 1990aaf36..3ce4a1291 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp @@ -11,7 +11,6 @@ #include "Sound/sound.h" #include "itemdata/creature_info.h" #include "animation.h" -#include "item.h" BITE_INFO GladiatorBite = { 0, 0, 0, 16 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp index aae868536..54fe16dd4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp @@ -12,7 +12,6 @@ #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 }; diff --git a/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp b/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp index 65f0528e8..4477a5853 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp @@ -1,16 +1,15 @@ #include "framework.h" #include "tr5_gunship.h" #include "level.h" -#include "control\los.h" -#include "Sound\sound.h" +#include "control/los.h" +#include "Sound/sound.h" #include "animation.h" #include "camera.h" -#include "effects\effects.h" -#include "effects\debris.h" +#include "effects/effects.h" +#include "effects/debris.h" #include "objects.h" #include "items.h" #include "lara.h" -#include "item.h" int GunShipCounter = 0; diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp index c02c9f528..d6372826e 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp @@ -1,17 +1,14 @@ #include "framework.h" #include "tr5_hydra.h" #include "items.h" -#include "sphere.h" #include "control/box.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "setup.h" -#include "people.h" #include "animation.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include "item.h" #define STATE_HYDRA_STOP 0 #define STATE_HYDRA_BITE_ATTACK1 1 diff --git a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp index 5db65c857..fc63166f7 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp @@ -1,17 +1,15 @@ #include "framework.h" #include "tr5_imp.h" #include "items.h" -#include "sphere.h" #include "lara.h" #include "animation.h" -#include "effects\effects.h" -#include "effects\flmtorch.h" +#include "effects/effects.h" +#include "effects/flmtorch.h" #include "control/box.h" #include "setup.h" #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 a8d58919d..b7987a605 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp @@ -2,8 +2,8 @@ #include "tr5_lagoon_witch.h" #include "items.h" #include "control/box.h" -#include "effects\effects.h" -#include "effects\tomb4fx.h" +#include "effects/effects.h" +#include "effects/tomb4fx.h" #ifdef NEW_INV #include "newinv2.h" #else @@ -13,7 +13,6 @@ #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 049cb9b04..58ad04611 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_larson.cpp @@ -10,7 +10,6 @@ #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 db7c5c88f..db7ce1573 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp @@ -1,23 +1,19 @@ #include "framework.h" #include "tr5_laser_head.h" -#include "sphere.h" #include "items.h" -#include "effects\tomb4fx.h" -#include "effects\effects.h" -#include "control/box.h" +#include "effects/tomb4fx.h" +#include "effects/effects.h" #include "people.h" -#include "effects\debris.h" +#include "effects/debris.h" #include "animation.h" -#include "control\los.h" -#include "traps.h" +#include "control/los.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "tr5_laserhead_info.h" -#include +#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_lion.cpp b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp index 3f9343cda..ec372cfef 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp @@ -2,16 +2,14 @@ #include "tr5_lion.h" #include "items.h" -#include "effects\effects.h" -#include "control/lot.h" +#include "effects/effects.h" #include "control/box.h" -#include "effects\tomb4fx.h" +#include "effects/tomb4fx.h" #include "setup.h" #include "level.h" #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 e88af9506..2e50e6e53 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp @@ -7,7 +7,6 @@ #include "lara.h" #include "itemdata/creature_info.h" #include "control/control.h" -#include "item.h" void InitialiseReaper(short itemNum) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp index 8ae86bbb6..9e9b625e7 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp @@ -1,21 +1,19 @@ #include "framework.h" #include "tr5_roman_statue.h" -#include "sphere.h" #include "items.h" -#include "effects\tomb4fx.h" -#include "effects\effects.h" +#include "effects/tomb4fx.h" +#include "effects/effects.h" #include "control/box.h" #include "people.h" -#include "effects\debris.h" +#include "effects/debris.h" #include "animation.h" #include "control/control.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" -#include -#include "item.h" +#include "Game/effects/lightning.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 aaf2a2496..06b597dec 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp @@ -3,20 +3,16 @@ #include "items.h" #include "control/box.h" #include "people.h" -#include "sphere.h" -#include "effects\tomb4fx.h" -#include "effects\effects.h" -#include "lara_fire.h" +#include "effects/effects.h" #include "animation.h" #include "lara_one_gun.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "itemdata/creature_info.h" #include "collide.h" -#include "control\los.h" -#include "item.h" +#include "control/los.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 69cca5769..6d9f3c79e 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_willowwisp.cpp @@ -3,7 +3,6 @@ #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 e24ccb38a..c159b1452 100644 --- a/TR5Main/Objects/TR5/Light/tr5_light.cpp +++ b/TR5Main/Objects/TR5/Light/tr5_light.cpp @@ -6,7 +6,7 @@ #include "Sound/sound.h" #include "Specific/trmath.h" #include "animation.h" -#include "item.h" +#include "items.h" void PulseLightControl(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp index c2b57c4a0..dac097076 100644 --- a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "tr5_ExpandingPlatform.h" +#include "tr5_expandingplatform.h" #include "items.h" #include "level.h" #include "control/control.h" @@ -9,7 +9,6 @@ #include "camera.h" #include "lara.h" #include "collide.h" -#include "item.h" void InitialiseExpandingPlatform(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp index c0781aa9b..85619e252 100644 --- a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp @@ -3,12 +3,10 @@ #include "items.h" #include "level.h" #include "control/control.h" -#include "effects\effects.h" -#include "sphere.h" +#include "effects/effects.h" #include "animation.h" #include "lara.h" #include "lara_collide.h" -#include "item.h" void GenSlot1Control(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp index 0082c7ed3..273a11efd 100644 --- a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp @@ -5,7 +5,6 @@ #include "room.h" #include "Sound/sound.h" #include "objectslist.h" -#include "item.h" void InitialiseHighObject1(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_missile.cpp b/TR5Main/Objects/TR5/Object/tr5_missile.cpp index e1e19ad2b..355ffbdb8 100644 --- a/TR5Main/Objects/TR5/Object/tr5_missile.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_missile.cpp @@ -1,22 +1,17 @@ #include "framework.h" #include "tr5_missile.h" #include "items.h" -#include "control/box.h" -#include "people.h" #include "sphere.h" -#include "effects\tomb4fx.h" -#include "effects\effects.h" -#include "animation.h" -#include "traps.h" +#include "effects/tomb4fx.h" +#include "effects/effects.h" #include "level.h" -#include "effects\debris.h" +#include "effects/debris.h" #include "lara.h" -#include "Sound\sound.h" +#include "Sound/sound.h" #include "tr5_roman_statue.h" #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 5a86d9d1b..e03953945 100644 --- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp @@ -8,10 +8,9 @@ #include "control/box.h" #include "level.h" #include "input.h" -#include "Sound\sound.h" +#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 9fb6ffd46..2ba6b8c33 100644 --- a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp @@ -8,7 +8,6 @@ #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 489a9099a..5624ded86 100644 --- a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp @@ -9,7 +9,7 @@ #include "effects/effects.h" #include "level.h" #include "animation.h" -#include "item.h" +#include "items.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 2c6a32248..389ffaf32 100644 --- a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp @@ -3,12 +3,10 @@ #include "items.h" #include "level.h" #include "control/control.h" -#include "Sound\sound.h" -#include "effects\weather.h" +#include "Sound/sound.h" +#include "effects/weather.h" #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 76fbc0751..905f50365 100644 --- a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp @@ -4,9 +4,8 @@ #include "control/control.h" #include "items.h" #include "lara.h" -#include "Sound\sound.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 73c676527..8be2aac8d 100644 --- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp +++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp @@ -2,11 +2,9 @@ #include "tr5_smashobject.h" #include "level.h" #include "control/box.h" -#include "Sound\sound.h" -#include "effects\tomb4fx.h" +#include "Sound/sound.h" +#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 1474d92bf..1c0ad913e 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" +#include "items.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp index 2f48b0dad..e7b0045c9 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp @@ -8,7 +8,6 @@ #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 a1d8e2f70..81136f19c 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" +#include "items.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 5fdcf2472..2fc1ef24a 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" +#include "items.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 90a0c0fa2..292b32637 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp @@ -5,7 +5,6 @@ #include "lara.h" #include "control/control.h" #include "animation.h" -#include "item.h" void FallingCeilingControl(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp b/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp index cf46739ed..214a68f4f 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_romehammer.cpp @@ -2,7 +2,6 @@ #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 7402e80f7..2a7b03c62 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "camera.h" #include "effects\effects.h" -#include "item.h" +#include "items.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 6f8baf36e..20f7b9359 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" +#include "items.h" extern GameConfiguration g_Configuration; extern GameFlow *g_GameFlow; diff --git a/TR5Main/Renderer/Renderer11Draw.cpp b/TR5Main/Renderer/Renderer11Draw.cpp index 4b04917cb..c1e34c3e9 100644 --- a/TR5Main/Renderer/Renderer11Draw.cpp +++ b/TR5Main/Renderer/Renderer11Draw.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "item.h" +#include "items.h" extern TEN::Renderer::RendererHUDBar *g_DashBar; extern TEN::Renderer::RendererHUDBar *g_SFXVolumeBar; diff --git a/TR5Main/Renderer/Renderer11DrawEffect.cpp b/TR5Main/Renderer/Renderer11DrawEffect.cpp index d0e1fe984..99ff422ac 100644 --- a/TR5Main/Renderer/Renderer11DrawEffect.cpp +++ b/TR5Main/Renderer/Renderer11DrawEffect.cpp @@ -19,8 +19,8 @@ #include "Quad/RenderQuad.h" #include "particle/SimpleParticle.h" #include "Renderer/RendererSprites.h" -#include -#include "item.h" +#include "Game/effects/lightning.h" +#include "items.h" using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Renderer/Renderer11Frame.cpp b/TR5Main/Renderer/Renderer11Frame.cpp index e90119b74..5ad8ba532 100644 --- a/TR5Main/Renderer/Renderer11Frame.cpp +++ b/TR5Main/Renderer/Renderer11Frame.cpp @@ -7,7 +7,7 @@ #include "level.h" #include "setup.h" #include "RenderView\RenderView.h" -#include "item.h" +#include "items.h" namespace TEN::Renderer { diff --git a/TR5Main/Renderer/Renderer11Lara.cpp b/TR5Main/Renderer/Renderer11Lara.cpp index 37539d95d..ad1eaf31f 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" +#include "items.h" using namespace TEN::Renderer; diff --git a/TR5Main/Scripting/GameLogicScript.cpp b/TR5Main/Scripting/GameLogicScript.cpp index 6febf75d3..b37383b39 100644 --- a/TR5Main/Scripting/GameLogicScript.cpp +++ b/TR5Main/Scripting/GameLogicScript.cpp @@ -18,7 +18,7 @@ #include "ReservedScriptNames.h" #include "camera.h" #include -#include +#include "Game/effects/lightning.h" using namespace TEN::Effects::Lightning; diff --git a/TR5Main/Scripting/GameScriptItemInfo.cpp b/TR5Main/Scripting/GameScriptItemInfo.cpp index ee5f5e7b0..1290a6685 100644 --- a/TR5Main/Scripting/GameScriptItemInfo.cpp +++ b/TR5Main/Scripting/GameScriptItemInfo.cpp @@ -9,9 +9,7 @@ #include "control/lot.h" #include "GameScriptPosition.h" #include "GameScriptRotation.h" -#include "Specific\trmath.h" -#include "lara.h" -#include "item.h" +#include "Specific/trmath.h" /*** Represents any object inside the game world. diff --git a/TR5Main/Specific/input.cpp b/TR5Main/Specific/input.cpp index 51cad3da8..f3218be64 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" +#include "items.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 808303f62..cc48528d1 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -18,7 +18,7 @@ #include #include #include "Renderer11.h" -#include "item.h" +#include "items.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Specific/level.h b/TR5Main/Specific/level.h index 297082caa..36f60e6ca 100644 --- a/TR5Main/Specific/level.h +++ b/TR5Main/Specific/level.h @@ -6,7 +6,6 @@ #include "newtypes.h" #include "items.h" #include "room.h" -#include "items.h" #include "animation.h" #define AddPtr(p, t, n) p = (t*)((char*)(p) + (ptrdiff_t)(n)); diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj index 627c04ac1..612d5a635 100644 --- a/TR5Main/TombEngine.vcxproj +++ b/TR5Main/TombEngine.vcxproj @@ -143,7 +143,6 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters index 0a859f99f..90a7b17f3 100644 --- a/TR5Main/TombEngine.vcxproj.filters +++ b/TR5Main/TombEngine.vcxproj.filters @@ -316,6 +316,7 @@ + @@ -708,7 +709,7 @@ - +