diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp index 5bb6786e9..71c6a72f9 100644 --- a/TR5Main/Game/Lara/lara.cpp +++ b/TR5Main/Game/Lara/lara.cpp @@ -35,7 +35,7 @@ #include "GameFlowScript.h" #include "health.h" #include "flipeffect.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "rope.h" #include "rubberboat.h" diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index de2f7f4f2..b71dd3502 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -7,9 +7,9 @@ #include "lara_monkey.h" #include "input.h" #include "health.h" -#include "sound.h" +#include "Sound\sound.h" #include "draw.h" -#include "pickup.h" +#include "pickup\pickup.h" bool DoJump = false; diff --git a/TR5Main/Game/Lara/lara_cheat.cpp b/TR5Main/Game/Lara/lara_cheat.cpp index cd49a083a..70b962a86 100644 --- a/TR5Main/Game/Lara/lara_cheat.cpp +++ b/TR5Main/Game/Lara/lara_cheat.cpp @@ -7,7 +7,7 @@ #include "inventory.h" #endif #include "effects\effects.h" -#include "sound.h" +#include "Sound\sound.h" extern GameFlow* g_GameFlow; diff --git a/TR5Main/Game/Lara/lara_fire.cpp b/TR5Main/Game/Lara/lara_fire.cpp index e59f3536d..605258ad4 100644 --- a/TR5Main/Game/Lara/lara_fire.cpp +++ b/TR5Main/Game/Lara/lara_fire.cpp @@ -14,7 +14,7 @@ #include "lot.h" #include "setup.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "GameFlowScript.h" #include "lara_struct.h" diff --git a/TR5Main/Game/Lara/lara_flare.cpp b/TR5Main/Game/Lara/lara_flare.cpp index 9b014416e..0f074776e 100644 --- a/TR5Main/Game/Lara/lara_flare.cpp +++ b/TR5Main/Game/Lara/lara_flare.cpp @@ -2,7 +2,7 @@ #include "lara_flare.h" #include "level.h" #include "setup.h" -#include "sound.h" +#include "Sound\sound.h" #include "draw.h" #include "items.h" #include "sphere.h" diff --git a/TR5Main/Game/Lara/lara_objects.cpp b/TR5Main/Game/Lara/lara_objects.cpp index 62f35c9ea..6fd4721e9 100644 --- a/TR5Main/Game/Lara/lara_objects.cpp +++ b/TR5Main/Game/Lara/lara_objects.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "lara.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "draw.h" #include "rope.h" #include "lara_tests.h" diff --git a/TR5Main/Game/Lara/lara_one_gun.cpp b/TR5Main/Game/Lara/lara_one_gun.cpp index ea864e808..2628b6940 100644 --- a/TR5Main/Game/Lara/lara_one_gun.cpp +++ b/TR5Main/Game/Lara/lara_one_gun.cpp @@ -22,7 +22,7 @@ #include "setup.h" #include "input.h" #include "savegame.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\bubble.h" #include "generic_switch.h" diff --git a/TR5Main/Game/Lara/lara_slide.cpp b/TR5Main/Game/Lara/lara_slide.cpp index 00549b9ee..054995514 100644 --- a/TR5Main/Game/Lara/lara_slide.cpp +++ b/TR5Main/Game/Lara/lara_slide.cpp @@ -2,7 +2,7 @@ #include "lara.h" #include "lara_collide.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" short OldAngle = 1; diff --git a/TR5Main/Game/Lara/lara_swim.cpp b/TR5Main/Game/Lara/lara_swim.cpp index 5f897767f..ca6fe7e2e 100644 --- a/TR5Main/Game/Lara/lara_swim.cpp +++ b/TR5Main/Game/Lara/lara_swim.cpp @@ -12,7 +12,7 @@ #include "camera.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "GameFlowScript.h" struct SUBSUIT_INFO diff --git a/TR5Main/Game/Lara/lara_two_guns.cpp b/TR5Main/Game/Lara/lara_two_guns.cpp index 9da866b16..e77dc222a 100644 --- a/TR5Main/Game/Lara/lara_two_guns.cpp +++ b/TR5Main/Game/Lara/lara_two_guns.cpp @@ -9,7 +9,7 @@ #include "setup.h" #include "camera.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "prng.h" using namespace TEN::Math::Random; diff --git a/TR5Main/Game/camera.cpp b/TR5Main/Game/camera.cpp index 72ba65f98..ee557dd1f 100644 --- a/TR5Main/Game/camera.cpp +++ b/TR5Main/Game/camera.cpp @@ -10,7 +10,7 @@ #include "sphere.h" #include "level.h" #include "collide.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "input.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp index 7acc20580..6a37f609a 100644 --- a/TR5Main/Game/collide.cpp +++ b/TR5Main/Game/collide.cpp @@ -8,7 +8,7 @@ #include "sphere.h" #include "misc.h" #include "setup.h" -#include "sound.h" +#include "Sound\sound.h" #include "trmath.h" #include "prng.h" #include "room.h" diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp index d8282f100..bd4144a13 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "collide.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "camera.h" #include "Lara.h" -#include "hair.h" +#include "effects\hair.h" #include "items.h" #include "flipeffect.h" #include "draw.h" @@ -16,11 +16,10 @@ #endif #include "gameflow.h" #include "lot.h" -#include "pickup.h" #include "draw.h" #include "health.h" #include "savegame.h" -#include "sound.h" +#include "Sound\sound.h" #include "spotcam.h" #include "box.h" #include "objects.h" diff --git a/TR5Main/Game/control/trigger.cpp b/TR5Main/Game/control/trigger.cpp index dfc657793..25559d8f3 100644 --- a/TR5Main/Game/control/trigger.cpp +++ b/TR5Main/Game/control/trigger.cpp @@ -6,7 +6,7 @@ #include "box.h" #include "camera.h" #include "puzzles_keys.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lot.h" #include "spotcam.h" #include "traps.h" diff --git a/TR5Main/Game/door.cpp b/TR5Main/Game/door.cpp index 0de37dcc3..de3aa6685 100644 --- a/TR5Main/Game/door.cpp +++ b/TR5Main/Game/door.cpp @@ -15,11 +15,11 @@ #include "box.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "trmath.h" #include "cog_switch.h" #include "generic_switch.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "fullblock_switch.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Game/effects/effects.cpp b/TR5Main/Game/effects/effects.cpp index 4c856ea62..4db82a8ef 100644 --- a/TR5Main/Game/effects/effects.cpp +++ b/TR5Main/Game/effects/effects.cpp @@ -5,7 +5,7 @@ #include "effects\tomb4fx.h" #include "traps.h" #include "trmath.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "level.h" #include "objectslist.h" diff --git a/TR5Main/Game/effects/flmtorch.cpp b/TR5Main/Game/effects/flmtorch.cpp index d19a5bb99..2fc665c0c 100644 --- a/TR5Main/Game/effects/flmtorch.cpp +++ b/TR5Main/Game/effects/flmtorch.cpp @@ -1,6 +1,5 @@ #include "framework.h" #include "effects\flmtorch.h" - #include "effects\effects.h" #include "lara_flare.h" #include "lara.h" @@ -10,7 +9,7 @@ #include "level.h" #include "setup.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "snowmobile.h" extern OBJECT_COLLISION_BOUNDS FireBounds; diff --git a/TR5Main/Game/hair.cpp b/TR5Main/Game/effects/hair.cpp similarity index 100% rename from TR5Main/Game/hair.cpp rename to TR5Main/Game/effects/hair.cpp diff --git a/TR5Main/Game/hair.h b/TR5Main/Game/effects/hair.h similarity index 100% rename from TR5Main/Game/hair.h rename to TR5Main/Game/effects/hair.h diff --git a/TR5Main/Game/effects/lightning.cpp b/TR5Main/Game/effects/lightning.cpp index 78bc127a8..1534eba07 100644 --- a/TR5Main/Game/effects/lightning.cpp +++ b/TR5Main/Game/effects/lightning.cpp @@ -5,7 +5,7 @@ #include "draw.h" #include "setup.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\bubble.h" #include "trmath.h" #include "GameFlowScript.h" diff --git a/TR5Main/Game/effects/tomb4fx.cpp b/TR5Main/Game/effects/tomb4fx.cpp index 902beffa6..a7b7e9e72 100644 --- a/TR5Main/Game/effects/tomb4fx.cpp +++ b/TR5Main/Game/effects/tomb4fx.cpp @@ -5,7 +5,7 @@ #include "draw.h" #include "setup.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\bubble.h" #include "trmath.h" #include "GameFlowScript.h" diff --git a/TR5Main/Game/flipeffect.cpp b/TR5Main/Game/flipeffect.cpp index c23ddbc63..6dada73cc 100644 --- a/TR5Main/Game/flipeffect.cpp +++ b/TR5Main/Game/flipeffect.cpp @@ -2,19 +2,19 @@ #include "flipeffect.h" #include "Lara.h" #include "lot.h" -#include "hair.h" +#include "effects\hair.h" #include "draw.h" #include "sphere.h" #include "level.h" #include "setup.h" #include "camera.h" #include "savegame.h" -#include "sound.h" +#include "Sound\sound.h" #include "tr5_rats_emitter.h" #include "tr5_bats_emitter.h" #include "tr5_spider_emitter.h" #include "tr5_pushableblock.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "lara_fire.h" #include "effects\effects.h" diff --git a/TR5Main/Game/health.cpp b/TR5Main/Game/health.cpp index a6312f4a4..310b853fc 100644 --- a/TR5Main/Game/health.cpp +++ b/TR5Main/Game/health.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "health.h" #include "draw.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lara.h" #include "camera.h" #include "level.h" diff --git a/TR5Main/Game/inventory.cpp b/TR5Main/Game/inventory.cpp index 4664768c0..b7688dcdb 100644 --- a/TR5Main/Game/inventory.cpp +++ b/TR5Main/Game/inventory.cpp @@ -5,7 +5,7 @@ #include "control.h" #include "lara_fire.h" #include "gameflow.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "Lara.h" #include "camera.h" diff --git a/TR5Main/Game/missile.cpp b/TR5Main/Game/missile.cpp index 3f65f5d56..1a9b4ff00 100644 --- a/TR5Main/Game/missile.cpp +++ b/TR5Main/Game/missile.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "missile.h" -#include "sound.h" +#include "Sound\sound.h" #include "items.h" #include "effects\effects.h" #include "draw.h" diff --git a/TR5Main/Game/newinv2.cpp b/TR5Main/Game/newinv2.cpp index caa8963fd..709028809 100644 --- a/TR5Main/Game/newinv2.cpp +++ b/TR5Main/Game/newinv2.cpp @@ -5,7 +5,7 @@ #include "control.h" #include "lara_fire.h" #include "gameflow.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "Lara.h" #include "camera.h" @@ -16,7 +16,7 @@ #include "lara_two_guns.h" #include "level.h" #include "input.h" -#include "pickup.h" +#include "pickup\pickup.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 ae3f970f3..0ac223c3c 100644 --- a/TR5Main/Game/objects.cpp +++ b/TR5Main/Game/objects.cpp @@ -13,7 +13,7 @@ #include "effects\tomb4fx.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" OBJECT_TEXTURE* WaterfallTextures[6]; float WaterfallY[6]; diff --git a/TR5Main/Game/people.cpp b/TR5Main/Game/people.cpp index 2886860e3..5686a529a 100644 --- a/TR5Main/Game/people.cpp +++ b/TR5Main/Game/people.cpp @@ -6,7 +6,7 @@ #include "sphere.h" #include "effects\debris.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" int ShotLara(ITEM_INFO* item, AI_INFO* info, BITE_INFO* gun, short extra_rotation, int damage) { diff --git a/TR5Main/Game/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp similarity index 99% rename from TR5Main/Game/pickup.cpp rename to TR5Main/Game/pickup/pickup.cpp index f12921864..b4a85538f 100644 --- a/TR5Main/Game/pickup.cpp +++ b/TR5Main/Game/pickup/pickup.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "phd_global.h" #include "lara.h" #include "draw.h" @@ -25,7 +25,7 @@ #include "camera.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "tr4_clockwork_beetle.h" #include "pickup/pickup_ammo.h" diff --git a/TR5Main/Game/pickup.h b/TR5Main/Game/pickup/pickup.h similarity index 100% rename from TR5Main/Game/pickup.h rename to TR5Main/Game/pickup/pickup.h diff --git a/TR5Main/Game/puzzles_keys.cpp b/TR5Main/Game/puzzles_keys.cpp index 4ee1e05ca..24ce4c0fa 100644 --- a/TR5Main/Game/puzzles_keys.cpp +++ b/TR5Main/Game/puzzles_keys.cpp @@ -8,7 +8,7 @@ #include "inventory.h" #endif #include "switch.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "draw.h" #include "control.h" #include "puzzles_keys.h" diff --git a/TR5Main/Game/rope.cpp b/TR5Main/Game/rope.cpp index 496185db1..24e9e5ebd 100644 --- a/TR5Main/Game/rope.cpp +++ b/TR5Main/Game/rope.cpp @@ -5,7 +5,7 @@ #include "level.h" #include "input.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" PENDULUM CurrentPendulum; PENDULUM AlternatePendulum; diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index eecaf830c..98905fdeb 100644 --- a/TR5Main/Game/savegame.cpp +++ b/TR5Main/Game/savegame.cpp @@ -3,12 +3,12 @@ #include "Lara.h" #include "items.h" #include "box.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "lot.h" #include "switch.h" #include "spotcam.h" #include "traps.h" -#include "sound.h" +#include "Sound\sound.h" #include "level.h" #include "setup.h" #include "camera.h" diff --git a/TR5Main/Game/switch.cpp b/TR5Main/Game/switch.cpp index ef84a05fe..c9743e10f 100644 --- a/TR5Main/Game/switch.cpp +++ b/TR5Main/Game/switch.cpp @@ -16,7 +16,7 @@ #include "setup.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.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 b42e548c3..7d56c3816 100644 --- a/TR5Main/Game/traps.cpp +++ b/TR5Main/Game/traps.cpp @@ -12,7 +12,7 @@ #include "draw.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "kayak.h" static short WreckingBallData[2] = {0, 0}; diff --git a/TR5Main/Objects/Effects/tr4_locusts.cpp b/TR5Main/Objects/Effects/tr4_locusts.cpp index 98e3af289..fbd1f0fec 100644 --- a/TR5Main/Objects/Effects/tr4_locusts.cpp +++ b/TR5Main/Objects/Effects/tr4_locusts.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_locusts.h" -#include "sound.h" +#include "Sound\sound.h" #include "trmath.h" #include "sphere.h" #include "misc.h" diff --git a/TR5Main/Objects/Effects/tr5_electricity.cpp b/TR5Main/Objects/Effects/tr5_electricity.cpp index 73ad527f4..bfef6f7b2 100644 --- a/TR5Main/Objects/Effects/tr5_electricity.cpp +++ b/TR5Main/Objects/Effects/tr5_electricity.cpp @@ -6,7 +6,7 @@ #include "draw.h" #include "lara.h" #include "lara_collide.h" -#include "sound.h" +#include "Sound\sound.h" #include "sphere.h" #include "traps.h" diff --git a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp index 111ed7c0e..390de7a8e 100644 --- a/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/crowbar_switch.cpp @@ -5,8 +5,8 @@ #include "lara.h" #include "crowbar_switch.h" #include "newinv2.h" -#include "sound.h" -#include "pickup.h" +#include "Sound\sound.h" +#include "pickup\pickup.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp index 9ce3e8ba6..393d01efa 100644 --- a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp @@ -4,8 +4,8 @@ #include "input.h" #include "lara.h" #include "generic_switch.h" -#include "sound.h" -#include "pickup.h" +#include "Sound\sound.h" +#include "pickup\pickup.h" namespace TEN::Entities::Switches { diff --git a/TR5Main/Objects/Generic/Switches/turn_switch.cpp b/TR5Main/Objects/Generic/Switches/turn_switch.cpp index c32c039dd..80ad45b09 100644 --- a/TR5Main/Objects/Generic/Switches/turn_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/turn_switch.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "generic_switch.h" #include "door.h" -#include "sound.h" +#include "Sound\sound.h" #include "switch.h" namespace TEN::Entities::Switches diff --git a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp index 85b78814c..4397f8838 100644 --- a/TR5Main/Objects/Generic/Switches/underwater_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/underwater_switch.cpp @@ -4,7 +4,7 @@ #include "lara.h" #include "underwater_switch.h" #include "newinv2.h" -#include "sound.h" +#include "Sound\sound.h" #include "generic_switch.h" namespace TEN::Entities::Switches diff --git a/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp b/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp index be95a1d4c..90c853fd4 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp @@ -4,7 +4,7 @@ #include "level.h" #include "lara.h" #include "people.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\tomb4fx.h" #include "tr1_centaur.h" #include "sphere.h" diff --git a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp index fbae72a31..135a2890e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp @@ -7,7 +7,7 @@ #include "effects\tomb4fx.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 d7bce3512..dcf3f4891 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp @@ -5,7 +5,7 @@ #include "items.h" #include "missile.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\effects.h" #include "trmath.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp index fcbe82e8b..18b930619 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp @@ -11,7 +11,7 @@ #include "level.h" #include "setup.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #define DRAGON_SWIPE_DAMAGE 250 diff --git a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp index 39513ee29..3c2446ea5 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO knifeLeft = { 0, 0, 0, 5 }; BITE_INFO knifeRight = { 0, 0, 0, 8 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp index 152ff2b21..9c44e96a3 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp @@ -3,7 +3,7 @@ #include "box.h" #include "effects\effects.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp index 876f99eb9..3aa571be1 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp @@ -9,7 +9,7 @@ #include "sphere.h" #include "setup.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "snowmobile.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 d4d5e177d..e357dae18 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO spearLeftBite = { 0, 0, 920, 11 }; BITE_INFO spearRightBite = { 0, 0, 920, 18 }; diff --git a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp index 892c1192d..46377fc06 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp @@ -7,7 +7,7 @@ #include "effects\tomb4fx.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO swordBite = { 0, 37, 550, 15 }; diff --git a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp index 194bb28cf..c4e0c9ee7 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "setup.h" #include "effects\effects.h" -#include "sound.h" +#include "Sound\sound.h" #include "items.h" void InitialiseSpinningBlade(short itemNumber) diff --git a/TR5Main/Objects/TR2/Vehicles/boat.cpp b/TR5Main/Objects/TR2/Vehicles/boat.cpp index 327364eda..b16d0bd23 100644 --- a/TR5Main/Objects/TR2/Vehicles/boat.cpp +++ b/TR5Main/Objects/TR2/Vehicles/boat.cpp @@ -8,7 +8,7 @@ #include "setup.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include #include diff --git a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp index 59384fc35..6ea214369 100644 --- a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp +++ b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp @@ -13,7 +13,7 @@ #include "setup.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include #include "prng.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp index aed0cbb91..086cbc62e 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO civvy_hit = { 0,0,0, 13 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp index d5ed697b4..842a9d252 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp @@ -10,7 +10,7 @@ #include "lot.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO flamerBite = { 0, 340, 64, 7 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp index 66ece602c..559fe1ec4 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp @@ -8,7 +8,7 @@ #include "lot.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" enum MPGUN_STATES { diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp index 2c27eb92f..2b31ffdcf 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp @@ -8,7 +8,7 @@ #include "lot.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO mpstickBite1 = { 247, 10, 11, 13 }; BITE_INFO mpstickBite2 = { 0, 0, 100, 6 }; diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index f5f6744b8..8fe6eeba4 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 3de37849f..643c0c2bb 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp @@ -12,7 +12,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" static BOSS_STRUCT BossData; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp index eba641421..46dc4b473 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp @@ -11,7 +11,7 @@ #include "setup.h" #include "lara.h" #include "traps.h" -#include "sound.h" +#include "Sound\sound.h" enum TonyFlameType { diff --git a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp index 574f404d4..a46b0af2f 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp @@ -5,7 +5,7 @@ #include "items.h" #include "sphere.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #include "people.h" #include "draw.h" #include "setup.h" diff --git a/TR5Main/Objects/TR3/Trap/train.cpp b/TR5Main/Objects/TR3/Trap/train.cpp index 8173b4ad2..5085232d0 100644 --- a/TR5Main/Objects/TR3/Trap/train.cpp +++ b/TR5Main/Objects/TR3/Trap/train.cpp @@ -4,7 +4,7 @@ #include "control.h" #include "level.h" #include "effects\effects.h" -#include "sound.h" +#include "Sound\sound.h" #include "camera.h" #include "sphere.h" #include "lara.h" diff --git a/TR5Main/Objects/TR3/Vehicles/biggun.cpp b/TR5Main/Objects/TR3/Vehicles/biggun.cpp index eed6ba939..0a552f89b 100644 --- a/TR5Main/Objects/TR3/Vehicles/biggun.cpp +++ b/TR5Main/Objects/TR3/Vehicles/biggun.cpp @@ -6,7 +6,7 @@ #include "input.h" #include "lara.h" #include "lara_flare.h" -#include "sound.h" +#include "Sound\sound.h" #include "sphere.h" #include "effects\effects.h" #include "lara_struct.h" diff --git a/TR5Main/Objects/TR3/Vehicles/minecart.cpp b/TR5Main/Objects/TR3/Vehicles/minecart.cpp index 106753fb7..b40fadbf8 100644 --- a/TR5Main/Objects/TR3/Vehicles/minecart.cpp +++ b/TR5Main/Objects/TR3/Vehicles/minecart.cpp @@ -12,7 +12,7 @@ #include "level.h" #include "setup.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" using std::vector; diff --git a/TR5Main/Objects/TR3/Vehicles/quad.cpp b/TR5Main/Objects/TR3/Vehicles/quad.cpp index 466fcedb0..8fd836551 100644 --- a/TR5Main/Objects/TR3/Vehicles/quad.cpp +++ b/TR5Main/Objects/TR3/Vehicles/quad.cpp @@ -13,7 +13,7 @@ #include "setup.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "prng.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 82974ed9e..04aa362ef 100644 --- a/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp +++ b/TR5Main/Objects/TR3/Vehicles/rubberboat.cpp @@ -6,7 +6,7 @@ #include "lara.h" #include "input.h" #include "sphere.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\bubble.h" #include "draw.h" diff --git a/TR5Main/Objects/TR3/Vehicles/upv.cpp b/TR5Main/Objects/TR3/Vehicles/upv.cpp index c3faa5279..1efc1151f 100644 --- a/TR5Main/Objects/TR3/Vehicles/upv.cpp +++ b/TR5Main/Objects/TR3/Vehicles/upv.cpp @@ -16,7 +16,7 @@ #include "level.h" #include "input.h" #include "savegame.h" -#include "sound.h" +#include "Sound\sound.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 b2e53bfde..1c76f4ffd 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp @@ -3,7 +3,7 @@ #include "control.h" #include "sphere.h" #include "effects\effects.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "box.h" #include "level.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp index e5fdbbad0..9e867f220 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp @@ -9,7 +9,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #define STATE_GUIDE_STOP 1 #define STATE_GUIDE_WALK 2 diff --git a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp index f02faebd3..4b259e6de 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp @@ -8,7 +8,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" BITE_INFO knightTemplarBite = { 0, 0, 0, 11 }; diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp index 5098cdcce..3960ee299 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp @@ -13,7 +13,7 @@ #include "effects\tomb4fx.h" #include "sphere.h" #include "people.h" -#include "sound.h" +#include "Sound\sound.h" #include "trmath.h" #include "objectslist.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp index 7878db00b..2c44b0f5a 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp @@ -8,7 +8,7 @@ #include "effects\debris.h" #include "lot.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "effects\tomb4fx.h" #include "level.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp index f00ec3ff4..13d740856 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" enum SPHIX_STATES { SPHINX_EMPTY, diff --git a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp index be511aa25..ef3d8e55f 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp @@ -9,7 +9,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #include #define STATE_VON_CROY_STOP 1 diff --git a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp index 6b3c5e772..18061edc7 100644 --- a/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_clockwork_beetle.cpp @@ -4,7 +4,7 @@ #include "level.h" #include "lara.h" #include "draw.h" -#include "sound.h" +#include "Sound\sound.h" void ClockworkBeetleControl(short item_number) { diff --git a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp index 8c6081f53..73852d542 100644 --- a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp @@ -2,7 +2,7 @@ #include "tr4_laradouble.h" #include "items.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "box.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp index 58e516cb8..628e113a0 100644 --- a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp @@ -4,7 +4,7 @@ #include "level.h" #include "setup.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" #include "effects\effects.h" #include "items.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp index a0e1e45fd..569083dae 100644 --- a/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_sarcophagus.cpp @@ -4,7 +4,7 @@ #include "input.h" #include "lara.h" #include "items.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "setup.h" #include "health.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_scales.cpp b/TR5Main/Objects/TR4/Object/tr4_scales.cpp index 7788d3b10..a656ef3dc 100644 --- a/TR5Main/Objects/TR4/Object/tr4_scales.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_scales.cpp @@ -6,7 +6,7 @@ #include "items.h" #include "lara.h" #include "switch.h" -#include "sound.h" +#include "Sound\sound.h" #include "draw.h" #include "effects\tomb4fx.h" #include "tr4_ahmet.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_senet.cpp b/TR5Main/Objects/TR4/Object/tr4_senet.cpp index 103d58a0c..3959a49c5 100644 --- a/TR5Main/Objects/TR4/Object/tr4_senet.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_senet.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_senet.h" -#include "sound.h" +#include "Sound\sound.h" #include "items.h" #include "control.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp index 3c497268b..1bb568ead 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "control.h" #include "sphere.h" -#include "sound.h" +#include "Sound\sound.h" void CogControl(short itemNum) { diff --git a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp index 2c007f1a8..1554c20bb 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_mine.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_mine.cpp @@ -2,7 +2,7 @@ #include "tr4_mine.h" #include "level.h" #include "sphere.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\effects.h" #include "effects\tomb4fx.h" #include "items.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp index 6fef2eac8..b74872fe3 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_slicerdicer.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "items.h" #include "trmath.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp index 9902e3f81..338e1965d 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp @@ -2,7 +2,7 @@ #include "tr4_spikyceiling.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "items.h" #include "lara.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp index 5ffb81294..eb75deb5a 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp @@ -2,7 +2,7 @@ #include "tr4_spikywall.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" #include "items.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp index 4507c5d20..da2f2c502 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp @@ -2,7 +2,7 @@ #include "tr4_stargate.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "collide.h" #include "sphere.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Vehicles/jeep.cpp b/TR5Main/Objects/TR4/Vehicles/jeep.cpp index e1016e07b..3eb6331cc 100644 --- a/TR5Main/Objects/TR4/Vehicles/jeep.cpp +++ b/TR5Main/Objects/TR4/Vehicles/jeep.cpp @@ -15,7 +15,7 @@ #include "sphere.h" #include "lara_flare.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp index 29a410c1c..71bdf2908 100644 --- a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp +++ b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp @@ -16,7 +16,7 @@ #include "lara_one_gun.h" #include "effects\tomb4fx.h" #include "items.h" -#include "sound.h" +#include "Sound\sound.h" #include "health.h" #include "camera.h" #include "prng.h" diff --git a/TR5Main/Objects/TR4/tr4_objects.cpp b/TR5Main/Objects/TR4/tr4_objects.cpp index 864c39585..a14aa09ec 100644 --- a/TR5Main/Objects/TR4/tr4_objects.cpp +++ b/TR5Main/Objects/TR4/tr4_objects.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_objects.h" -#include "pickup.h" +#include "pickup\pickup.h" /// entities #include "tr4_ahmet.h" // OK #include "tr4_baddy.h" // OK diff --git a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp index 33a9f380d..2aa4d1f95 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp @@ -5,7 +5,7 @@ #include "setup.h" #include "effects\effects.h" #include "effects\tomb4fx.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" #include "draw.h" #include diff --git a/TR5Main/Objects/TR5/Emitter/tr5_dart_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_dart_emitter.cpp index a97f69575..2e2e48c76 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_dart_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_dart_emitter.cpp @@ -4,7 +4,7 @@ #include "lara.h" #include "effects\effects.h" #include "items.h" -#include "sound.h" +#include "Sound\sound.h" void DartControl(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp index 544eef401..52c3979ab 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp @@ -5,7 +5,7 @@ #include "setup.h" #include "effects\effects.h" #include "effects\tomb4fx.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" int NextRat; diff --git a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp index 5e82d57c0..c54442979 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp @@ -5,7 +5,7 @@ #include "setup.h" #include "effects\effects.h" #include "effects\tomb4fx.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" int NextSpider; diff --git a/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp b/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp index 2a5f8888e..ef5c38d17 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_autoguns.cpp @@ -6,7 +6,7 @@ #include "effects\effects.h" #include "effects\tomb4fx.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" void InitialiseAutoGuns(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp index 88fb39132..c3d5cea5b 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp @@ -7,7 +7,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 4fe054c51..93863a67d 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp @@ -10,7 +10,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 e75903963..1614f8df9 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp @@ -11,7 +11,7 @@ #include "traps.h" #include "setup.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #define STATE_HITMAN_STOP 1 #define STATE_HITMAN_WALK 2 diff --git a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp index f8d225808..fd695f9c8 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp @@ -6,7 +6,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 78c42623e..79ec37e00 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp @@ -9,7 +9,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 e077a7d8f..e69620cf6 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp @@ -10,7 +10,7 @@ #include "draw.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.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 6d2d1c56a..843e5c460 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gunship.cpp @@ -2,7 +2,7 @@ #include "tr5_gunship.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "draw.h" #include "camera.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp index e2aa03ae0..361f0c24d 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp @@ -9,7 +9,7 @@ #include "draw.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #define STATE_HYDRA_STOP 0 #define STATE_HYDRA_BITE_ATTACK1 1 diff --git a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp index 78c019a92..ee0415a03 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp @@ -13,7 +13,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" struct LASER_HEAD_INFO { diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp index 28dff549b..0635c8547 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp @@ -12,7 +12,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #define STATE_ROMAN_STATUE_STOP 1 #define STATE_ROMAN_STATUE_SCREAMING 2 diff --git a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp index 73e8b8f27..5c455d588 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp @@ -12,7 +12,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" static void TriggerSubmarineSparks(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Light/tr5_light.cpp b/TR5Main/Objects/TR5/Light/tr5_light.cpp index 3bc198c8b..c0475ff57 100644 --- a/TR5Main/Objects/TR5/Light/tr5_light.cpp +++ b/TR5Main/Objects/TR5/Light/tr5_light.cpp @@ -4,7 +4,7 @@ #include "level.h" #include "control.h" #include "effects\effects.h" -#include "sound.h" +#include "Sound\sound.h" #include "sphere.h" #include "trmath.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp index 73b016bb3..73163c859 100644 --- a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp @@ -2,7 +2,7 @@ #include "tr5_bodypart.h" #include "effects\effects.h" #include "trmath.h" -#include "sound.h" +#include "Sound\sound.h" #include "tr5_missile.h" void ControlBodyPart(short fxNumber) diff --git a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp index e34d3bd95..a2e43bb48 100644 --- a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp @@ -5,7 +5,7 @@ #include "control.h" #include "box.h" #include "objectslist.h" -#include "sound.h" +#include "Sound\sound.h" #include "camera.h" #include "lara.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp index 973831ca5..4c88839a1 100644 --- a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "objectslist.h" void InitialiseHighObject1(short itemNumber) diff --git a/TR5Main/Objects/TR5/Object/tr5_missile.cpp b/TR5Main/Objects/TR5/Object/tr5_missile.cpp index f283b611f..301a20ce5 100644 --- a/TR5Main/Objects/TR5/Object/tr5_missile.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_missile.cpp @@ -11,7 +11,7 @@ #include "level.h" #include "effects\debris.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" #include "tr5_roman_statue.h" #include "tr5_hydra.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp index 1784af3f1..771c8da61 100644 --- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp @@ -8,7 +8,7 @@ #include "box.h" #include "level.h" #include "input.h" -#include "sound.h" +#include "Sound\sound.h" #define GET_PUSHABLEINFO(item) ((PUSHABLE_INFO*) item->data) static OBJECT_COLLISION_BOUNDS PushableBlockBounds = { diff --git a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp index 380cecf42..3b4a916c4 100644 --- a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp @@ -5,7 +5,7 @@ #include "control.h" #include "box.h" #include "objectslist.h" -#include "sound.h" +#include "Sound\sound.h" #include "camera.h" void InitialiseRaisingBlock(short itemNumber) diff --git a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp index c8cb7c974..83255e038 100644 --- a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp @@ -5,7 +5,7 @@ #include "control.h" #include "lara.h" #include "setup.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\effects.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 229402000..94980b98d 100644 --- a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" #include "camera.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp index a4c4a1df6..3ce2f3e8e 100644 --- a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp @@ -4,7 +4,7 @@ #include "control.h" #include "items.h" #include "lara.h" -#include "sound.h" +#include "Sound\sound.h" void InitialiseTwoBlocksPlatform(short itemNumber) { diff --git a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp index 877df4a28..d34ba5459 100644 --- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp +++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp @@ -2,7 +2,7 @@ #include "tr5_smashobject.h" #include "level.h" #include "box.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\tomb4fx.h" #include "items.h" #include "trmath.h" diff --git a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp index e37d817af..13b46b1f8 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp @@ -4,7 +4,7 @@ #include "input.h" #include "lara.h" #include "generic_switch.h" -#include "sound.h" +#include "Sound\sound.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 31cd9c5d5..65e49a656 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp @@ -4,7 +4,7 @@ #include "switch.h" #include "control.h" #include "items.h" -#include "sound.h" +#include "Sound\sound.h" #include "spotcam.h" #include "objectslist.h" #include "generic_switch.h" diff --git a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp index 6c1ea80a8..2c7fb7256 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp @@ -4,7 +4,7 @@ #include "trmath.h" #include "lara.h" #include "setup.h" -#include "sound.h" +#include "Sound\sound.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 dd62bd50f..dfdb5854b 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp @@ -2,7 +2,7 @@ #include "tr5_explosion.h" #include "level.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\effects.h" #include "effects\tomb4fx.h" #include "draw.h" diff --git a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp index 88dfd8ee4..96af8214e 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp @@ -4,7 +4,7 @@ #include "draw.h" #include "lara.h" #include "level.h" -#include "sound.h" +#include "Sound\sound.h" #include "effects\tomb4fx.h" #include "trmath.h" diff --git a/TR5Main/Objects/TR5/tr5_objects.cpp b/TR5Main/Objects/TR5/tr5_objects.cpp index 6cb44b1de..649251d4a 100644 --- a/TR5Main/Objects/TR5/tr5_objects.cpp +++ b/TR5Main/Objects/TR5/tr5_objects.cpp @@ -59,7 +59,7 @@ #include "lara_one_gun.h" #include "lara_flare.h" #include "lara_initialise.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "effects\flmtorch.h" #include "setup.h" #include "switch.h" diff --git a/TR5Main/Objects/Utils/object_helper.cpp b/TR5Main/Objects/Utils/object_helper.cpp index 9be864fcf..63123b970 100644 --- a/TR5Main/Objects/Utils/object_helper.cpp +++ b/TR5Main/Objects/Utils/object_helper.cpp @@ -2,7 +2,7 @@ #include "object_helper.h" #include "collide.h" #include "objects.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "puzzles_keys.h" #include "level.h" #include "tr5_smashobject.h" diff --git a/TR5Main/Renderer/Renderer11.cpp b/TR5Main/Renderer/Renderer11.cpp index 64770727e..4123e95d8 100644 --- a/TR5Main/Renderer/Renderer11.cpp +++ b/TR5Main/Renderer/Renderer11.cpp @@ -6,7 +6,7 @@ #include "configuration.h" #include "draw.h" #include "health.h" -#include "pickup.h" +#include "pickup\pickup.h" #ifndef NEW_INV #include "inventory.h" #endif diff --git a/TR5Main/Renderer/Renderer11Draw.cpp b/TR5Main/Renderer/Renderer11Draw.cpp index 7006b9896..dc508ac6a 100644 --- a/TR5Main/Renderer/Renderer11Draw.cpp +++ b/TR5Main/Renderer/Renderer11Draw.cpp @@ -18,7 +18,7 @@ #include "level.h" #include "setup.h" #include "control.h" -#include "sound.h" +#include "Sound\sound.h" #include "tr5_rats_emitter.h" #include "tr5_bats_emitter.h" #include "tr5_spider_emitter.h" @@ -26,7 +26,7 @@ #include #include #include "RenderView/RenderView.h" -#include "hair.h" +#include "effects\hair.h" #include "winmain.h" #include #include diff --git a/TR5Main/Renderer/Renderer11Lara.cpp b/TR5Main/Renderer/Renderer11Lara.cpp index 73a107681..b44a200ff 100644 --- a/TR5Main/Renderer/Renderer11Lara.cpp +++ b/TR5Main/Renderer/Renderer11Lara.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "Renderer11.h" #include "draw.h" -#include "hair.h" +#include "effects\hair.h" #include "lara.h" #include "control.h" #include "spotcam.h" diff --git a/TR5Main/Scripting/GameFlowScript.cpp b/TR5Main/Scripting/GameFlowScript.cpp index 1c0a90fdd..62a9439d3 100644 --- a/TR5Main/Scripting/GameFlowScript.cpp +++ b/TR5Main/Scripting/GameFlowScript.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "box.h" #include "lot.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" #include "draw.h" #include "AudioTracks.h" diff --git a/TR5Main/Scripting/GameLogicScript.cpp b/TR5Main/Scripting/GameLogicScript.cpp index 4bd5a3916..4b4ff400f 100644 --- a/TR5Main/Scripting/GameLogicScript.cpp +++ b/TR5Main/Scripting/GameLogicScript.cpp @@ -6,12 +6,12 @@ #include "lara.h" #include "savegame.h" #include "lot.h" -#include "sound.h" +#include "Sound\sound.h" #include "setup.h" #include "level.h" #include "effects\tomb4fx.h" #include "effects\effects.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "newinv2.h" #include "ObjectIDs.h" diff --git a/TR5Main/Game/groundfx.h b/TR5Main/Sound/groundfx.h similarity index 99% rename from TR5Main/Game/groundfx.h rename to TR5Main/Sound/groundfx.h index d331b08ce..fc482b401 100644 --- a/TR5Main/Game/groundfx.h +++ b/TR5Main/Sound/groundfx.h @@ -1,4 +1,5 @@ #pragma once + enum GroundMaterial : unsigned char { Mud = 0, diff --git a/TR5Main/Game/sound.cpp b/TR5Main/Sound/sound.cpp similarity index 99% rename from TR5Main/Game/sound.cpp rename to TR5Main/Sound/sound.cpp index 8c8b0e822..d33f982fa 100644 --- a/TR5Main/Game/sound.cpp +++ b/TR5Main/Sound/sound.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "sound.h" +#include "Sound\sound.h" #include "lara.h" #include "camera.h" #include "configuration.h" diff --git a/TR5Main/Sound/sound.h b/TR5Main/Sound/sound.h new file mode 100644 index 000000000..895d9749c --- /dev/null +++ b/TR5Main/Sound/sound.h @@ -0,0 +1,148 @@ +#pragma once +#include +#include +#include "control.h" +#include "sound_effects.h" + +enum SFX_TYPES +{ + SFX_LANDANDWATER = 0, + SFX_LANDONLY = (1 << 14), + SFX_WATERONLY = (2 << 14) +}; + +#define SFX_ALWAYS 2 +#define PITCH_SHIFT 4 + +#define SOUND_BASS_UNITS 1.0f / 1024.0f // TR->BASS distance unit coefficient +#define SOUND_MAXVOL_RADIUS 1024.0f // Max. volume hearing distance +#define SOUND_OMNIPRESENT_ORIGIN Vector3(1.17549e-038f, 1.17549e-038f, 1.17549e-038f) +#define SOUND_MAX_SAMPLES 8192 // Original was 1024, reallocate original 3-dword DX handle struct to just 1-dword memory pointer +#define SOUND_MAX_CHANNELS 32 // Original was 24, reallocate original 36-byte struct with 24-byte SoundEffectSlot struct +#define SOUND_LEGACY_SOUNDMAP_SIZE 450 +#define SOUND_NEW_SOUNDMAP_MAX_SIZE 4096 +#define SOUND_LEGACY_TRACKTABLE_SIZE 136 +#define SOUND_FLAG_NO_PAN (1<<12) // Unused flag +#define SOUND_FLAG_RND_PITCH (1<<13) +#define SOUND_FLAG_RND_GAIN (1<<14) +#define SOUND_MAX_PITCH_CHANGE 0.09f +#define SOUND_MAX_GAIN_CHANGE 0.0625f +#define SOUND_32BIT_SILENCE_LEVEL 4.9e-04f +#define SOUND_SAMPLE_FLAGS (BASS_SAMPLE_MONO | BASS_SAMPLE_FLOAT) +#define SOUND_XFADETIME_BGM 5000 +#define SOUND_XFADETIME_BGM_START 1500 +#define SOUND_XFADETIME_ONESHOT 200 +#define SOUND_XFADETIME_CUTSOUND 100 +#define SOUND_XFADETIME_HIJACKSOUND 50 +#define SOUND_BGM_DAMP_COEFFICIENT 0.6f + +#define TRACK_FOUND_SECRET "073_Secret" +#define TRACKS_PREFIX "Audio\\%s.%s" + +struct SoundEffectSlot +{ + short state; + short effectID; + float gain; + HCHANNEL channel; + Vector3 origin; +}; + +struct SoundTrackSlot +{ + HSTREAM channel; + std::string track; +}; + +enum sound_track_types +{ + SOUND_TRACK_ONESHOT, + SOUND_TRACK_BGM, + + NUM_SOUND_TRACK_TYPES +}; + +enum sound_filters +{ + SOUND_FILTER_REVERB, + SOUND_FILTER_COMPRESSOR, + SOUND_FILTER_LOWPASS, + + NUM_SOUND_FILTERS +}; + +enum sound_states +{ + SOUND_STATE_IDLE, + SOUND_STATE_ENDING, + SOUND_STATE_ENDED +}; + +enum sound_flags +{ + SOUND_NORMAL, + SOUND_WAIT, + SOUND_RESTART, + SOUND_LOOPED +}; + +enum reverb_type +{ + RVB_OUTSIDE, // 0x00 no reverberation + RVB_SMALL_ROOM, // 0x01 little reverberation + RVB_MEDIUM_ROOM, // 0x02 + RVB_LARGE_ROOM, // 0x03 + RVB_PIPE, // 0x04 highest reverberation, almost never used + + NUM_REVERB_TYPES +}; + +struct SAMPLE_INFO +{ + short number; + byte volume; + byte radius; + byte randomness; + signed char pitch; + short flags; +}; + +struct AudioTrack +{ + std::string Name; + byte Mask; + bool looped; +}; + +extern std::unordered_map g_AudioTracks; + +long SoundEffect(int effectID, PHD_3DPOS* position, int env_flags); +void StopSoundEffect(short effectID); +bool Sound_LoadSample(char *buffer, int compSize, int uncompSize, int currentIndex); +void Sound_FreeSamples(); +void SOUND_Stop(); +void S_CDPlay(std::string trackName, unsigned int mode); +void S_CDPlayEx(std::string trackName, DWORD mask, DWORD unknown); +void S_CDPlay(int index, unsigned int mode); +void S_CDPlayEx(int index, DWORD mask, DWORD unknown); +void S_CDStop(); +void SayNo(); +int GetShatterSound(int shatterID); + +static void CALLBACK Sound_FinishOneshotTrack(HSYNC handle, DWORD channel, DWORD data, void* userData); + +void SetVolumeMusic(int vol); +void SetVolumeFX(int vol); + +void Sound_Init(); +void Sound_DeInit(); +bool Sound_CheckBASSError(const char* message, bool verbose, ...); +void Sound_UpdateScene(); +void Sound_FreeSample(int index); +int Sound_GetFreeSlot(); +void Sound_FreeSlot(int index, unsigned int fadeout = 0); +int Sound_EffectIsPlaying(int effectID, PHD_3DPOS *position); +float Sound_DistanceToListener(PHD_3DPOS *position); +float Sound_DistanceToListener(Vector3 position); +float Sound_Attenuate(float gain, float distance, float radius); +bool Sound_UpdateEffectPosition(int index, PHD_3DPOS *position, bool force = false); diff --git a/TR5Main/Game/sound.h b/TR5Main/Sound/sound_effects.h similarity index 88% rename from TR5Main/Game/sound.h rename to TR5Main/Sound/sound_effects.h index 39e383f95..e6bbb5bd3 100644 --- a/TR5Main/Game/sound.h +++ b/TR5Main/Sound/sound_effects.h @@ -1,155 +1,4 @@ #pragma once -#include -#include -#include "control.h" - -enum SFX_TYPES -{ - SFX_LANDANDWATER = 0, - SFX_LANDONLY = (1 << 14), - SFX_WATERONLY = (2 << 14) -}; - -enum audio_tracks -{ - CDA_XA1_TL_10B, // TO CLIMB OUT, SWIM TO THE EDGE AND PRESS 'ACTION'. - CDA_XA1_Z10, - CDA_XA1_TL_05, // TO PERFORM A SIDEWAYS SOMERSAULT, PRESS 'LEFT' AND JUMP. - CDA_XA1_TL_08, // FOR ME TO CRAWL, HOLD DOWN 'CROUCH' AND NOW PUSH 'FORWARD'. - CDA_XA1_TL_11, // TO USE THE LEVER SWITCH, STAND NEXT TO THE SWITCH, AND PRESS 'ACTION'. - CDA_XA1_ANDYPEW, - CDA_XA1_SECRET, - CDA_XA1_TL_02, // TO LEAP THE SHORT DISTANCE, WALK TO THE EDGE, NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. - CDA_XA2_HMMM05, - CDA_XA2_TL_01, // TO CLIMB ONTO THIS CRATE, STAND NEXT TO THE CRATE, PUSH 'FORWARD', AND THEN 'ACTION'. - CDA_XA2_ATTACK04, - CDA_XA2_UWATER2B, - CDA_XA2_SPOOKY2A, - CDA_XA2_TL_10A, // TO SWIM, JUMP INTO THE WATER. USE 'ACTION' TO SWIM FORWARD, AND THE DIRECTIONS TO STEER. - CDA_XA2_HMMM02, - CDA_XA2_TOMS01, - CDA_XA3_ATTACK03, - CDA_XA3_ATTACK02, - CDA_XA3_HMMM01, - CDA_XA3_STEALTH1, - CDA_XA3_STEALTH2, - CDA_XA3_ATTACK01, - CDA_XA3_TL_06, // TO MONKEYSWING, JUMP STRAIGHT UP AT THE BARS, AND PRESS AND HOLD 'ACTION', THEN PUSH 'FORWARD'. - CDA_XA3_TL_03, // NOW LET'S TRY A LONGER LEAP. WALK TO THE EDGE, AND TAP 'BACK' ONCE. NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. - CDA_XA4_HMMM06, - CDA_XA4_MIL01, - CDA_XA4_Z_03, - CDA_XA4_HIT01, - CDA_XA4_SPOOKY05, - CDA_XA4_DRAMA01, - CDA_XA4_STEALTH4, - CDA_XA4_MIL05, - CDA_XA5_HMMM04, - CDA_XA5_MIL06, - CDA_XA5_SPOOKY02, - CDA_XA5_TL_12, // TO WALK THE TIGHTROPE, WALK UP TO THE ROPE AND PRESS 'ACTION'. PUSH 'FORWARD'. IF YOU UNBALANCE, PUSH IN THE OPPOSITE DIRECTION TO CORRECT. - CDA_XA5_MIL02A, - CDA_XA5_HMMM03, - CDA_XA5_MIL02, - CDA_XA5_TL_04, // AND NOW FOR THE BIG JUMP. WALK TO THE EDGE, THEN TAP 'BACK' ONCE. NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. WHEN IN MID-AIR, HOLD 'ACTION' TO GRAB ONTO THE LEDGE. - CDA_XA6_MIL04, - CDA_XA6_SOLO01, - CDA_XA6_Z12, - CDA_XA6_STEALTH3, - CDA_XA6_AUTHSOLO, - CDA_XA6_SPOOKY03, - CDA_XA6_Z13, - CDA_XA6_Z_04ANIM, - CDA_XA7_Z_06A, - CDA_XA7_ANDYOOOH, - CDA_XA7_ANDYOOER, - CDA_XA7_TL_07, // FOR ME TO CLIMB THIS WALL, STAND NEXT TO IT, AND PRESS 'FORWARD' AND 'ACTION' TOGETHER. KEEP HOLD OF 'ACTION' AND PUSH UP TO CLIMB THE WALL. - CDA_XA7_Z_02, - CDA_XA7_EVIBES01, - CDA_XA7_Z_06, - CDA_XA7_AUTHTR, - CDA_XA8_MIL03, - CDA_XA8_FIGHTSC, - CDA_XA8_RICHCUT3, - CDA_XA8_Z_13, - CDA_XA8_Z_08, - CDA_XA8_UWATER2A, - CDA_XA8_JOBYALRM, - CDA_XA8_MIL02B, - CDA_XA9_SWAMPY, - CDA_XA9_EVIBES02, - CDA_XA9_GODS01, - CDA_XA9_Z_03, - CDA_XA9_RICHCUT4, - CDA_XA9_TITLE4, - CDA_XA9_SPOOKY01, - CDA_XA9_CHOPIN01, - CDA_XA10_ECHOIR01, - CDA_XA10_TITLE3, - CDA_XA10_PERC01, - CDA_XA10_VC01, - CDA_XA10_TITLE2, - CDA_XA10_Z_09, - CDA_XA10_SPOOKY04, - CDA_XA10_Z_10, - CDA_XA11_VC01ATV, - CDA_XA11_ANDY3, - CDA_XA11_TITLE1, - CDA_XA11_FLYBY1, - CDA_XA11_MONK_2, - CDA_XA11_ANDY4, - CDA_XA11_FLYBY3, - CDA_XA11_FLYBY2, - CDA_XA12_MOSES01, - CDA_XA12_ANDY4B, - CDA_XA12_Z_10, - CDA_XA12_FLYBY4, - CDA_XA12_RICHCUT1, - CDA_XA12_ANDY5, - CDA_XA12_Z_05, - CDA_XA12_Z_01, - CDA_XA13_JOBY3, - CDA_XA13_ANDY7, - CDA_XA13_ANDREA3B, - CDA_XA13_COSSACK, - CDA_XA13_Z_07, - CDA_XA13_ANDY6, - CDA_XA13_ANDREA3, - CDA_XA13_JOBY7, - CDA_XA14_UWATER1, - CDA_XA14_JOBY1, - CDA_XA14_ANDY10, - CDA_XA14_RICHCUT2, - CDA_XA14_ANDREA1, - CDA_XA14_ANDY8, - CDA_XA14_JOBY6, - CDA_XA14_ECREDITS, - CDA_XA15_BOSS_01, - CDA_XA15_JOBY2, - CDA_XA15_JOBY4, - CDA_XA15_JOBY5, - CDA_XA15_JOBY9, - CDA_XA15_A_ANDY, - CDA_XA15_A_ROME, - CDA_XA15_ANDY2, - CDA_XA16_JOBY8, - CDA_XA16_A_SUB_AMB, - CDA_XA16_JOBY10, - CDA_XA16_A_HARBOUR_OUT, - CDA_XA16_A_ANDY_OUT_NORM, - CDA_XA16_A_ANDY_OUT_SPOOKY, - CDA_XA16_A_ROME_DAY, - CDA_XA16_A_UNDERWATER, - CDA_XA17_A_ROME_NIGHT, - CDA_XA17_A_VC_SAGA, - CDA_XA17_A_INDUSTRY, - CDA_XA17_ANDREA2, - CDA_XA17_ANDY1, - CDA_XA17_ANDREA4, - CDA_XA17_ANDY9, - CDA_XA17_ANDY11, - CDA_XA18_TITLE_MENU -}; enum sound_effects { @@ -1844,7 +1693,7 @@ enum sound_effects SFX_TR5_SWORD_GOD_SCREAM = 1817, SFX_TR5_KITCHEN_HOB_LOOP = 1818, SFX_TR5_KEYPAD_ASTRISK = 1819, - SFX_TR5_KEYPAD_HASH = 1820, + SFX_TR5_KEYPAD_HASH = 1820, SFX_TR5_KEYPAD_0 = 1821, SFX_TR5_KEYPAD_1 = 1822, SFX_TR5_KEYPAD_2 = 1823, @@ -2036,139 +1885,3 @@ enum sound_effects NUM_SFX }; - -#define SFX_ALWAYS 2 -#define PITCH_SHIFT 4 - -#define SOUND_BASS_UNITS 1.0f / 1024.0f // TR->BASS distance unit coefficient -#define SOUND_MAXVOL_RADIUS 1024.0f // Max. volume hearing distance -#define SOUND_OMNIPRESENT_ORIGIN Vector3(1.17549e-038f, 1.17549e-038f, 1.17549e-038f) -#define SOUND_MAX_SAMPLES 8192 // Original was 1024, reallocate original 3-dword DX handle struct to just 1-dword memory pointer -#define SOUND_MAX_CHANNELS 32 // Original was 24, reallocate original 36-byte struct with 24-byte SoundEffectSlot struct -#define SOUND_LEGACY_SOUNDMAP_SIZE 450 -#define SOUND_NEW_SOUNDMAP_MAX_SIZE 4096 -#define SOUND_LEGACY_TRACKTABLE_SIZE 136 -#define SOUND_FLAG_NO_PAN (1<<12) // Unused flag -#define SOUND_FLAG_RND_PITCH (1<<13) -#define SOUND_FLAG_RND_GAIN (1<<14) -#define SOUND_MAX_PITCH_CHANGE 0.09f -#define SOUND_MAX_GAIN_CHANGE 0.0625f -#define SOUND_32BIT_SILENCE_LEVEL 4.9e-04f -#define SOUND_SAMPLE_FLAGS (BASS_SAMPLE_MONO | BASS_SAMPLE_FLOAT) -#define SOUND_XFADETIME_BGM 5000 -#define SOUND_XFADETIME_BGM_START 1500 -#define SOUND_XFADETIME_ONESHOT 200 -#define SOUND_XFADETIME_CUTSOUND 100 -#define SOUND_XFADETIME_HIJACKSOUND 50 -#define SOUND_BGM_DAMP_COEFFICIENT 0.6f - -#define TRACK_FOUND_SECRET "073_Secret" -#define TRACKS_PREFIX "Audio\\%s.%s" - -struct SoundEffectSlot -{ - short state; - short effectID; - float gain; - HCHANNEL channel; - Vector3 origin; -}; - -struct SoundTrackSlot -{ - HSTREAM channel; - std::string track; -}; - -enum sound_track_types -{ - SOUND_TRACK_ONESHOT, - SOUND_TRACK_BGM, - - NUM_SOUND_TRACK_TYPES -}; - -enum sound_filters -{ - SOUND_FILTER_REVERB, - SOUND_FILTER_COMPRESSOR, - SOUND_FILTER_LOWPASS, - - NUM_SOUND_FILTERS -}; - -enum sound_states -{ - SOUND_STATE_IDLE, - SOUND_STATE_ENDING, - SOUND_STATE_ENDED -}; - -enum sound_flags -{ - SOUND_NORMAL, - SOUND_WAIT, - SOUND_RESTART, - SOUND_LOOPED -}; - -enum reverb_type -{ - RVB_OUTSIDE, // 0x00 no reverberation - RVB_SMALL_ROOM, // 0x01 little reverberation - RVB_MEDIUM_ROOM, // 0x02 - RVB_LARGE_ROOM, // 0x03 - RVB_PIPE, // 0x04 highest reverberation, almost never used - - NUM_REVERB_TYPES -}; - -struct SAMPLE_INFO -{ - short number; - byte volume; - byte radius; - byte randomness; - signed char pitch; - short flags; -}; - -struct AudioTrack -{ - std::string Name; - byte Mask; - bool looped; -}; - -extern std::unordered_map g_AudioTracks; - -long SoundEffect(int effectID, PHD_3DPOS* position, int env_flags); -void StopSoundEffect(short effectID); -bool Sound_LoadSample(char *buffer, int compSize, int uncompSize, int currentIndex); -void Sound_FreeSamples(); -void SOUND_Stop(); -void S_CDPlay(std::string trackName, unsigned int mode); -void S_CDPlayEx(std::string trackName, DWORD mask, DWORD unknown); -void S_CDPlay(int index, unsigned int mode); -void S_CDPlayEx(int index, DWORD mask, DWORD unknown); -void S_CDStop(); -void SayNo(); -int GetShatterSound(int shatterID); - -static void CALLBACK Sound_FinishOneshotTrack(HSYNC handle, DWORD channel, DWORD data, void* userData); - -void SetVolumeMusic(int vol); -void SetVolumeFX(int vol); - -void Sound_Init(); -void Sound_DeInit(); -bool Sound_CheckBASSError(const char* message, bool verbose, ...); -void Sound_UpdateScene(); -void Sound_FreeSample(int index); -int Sound_GetFreeSlot(); -void Sound_FreeSlot(int index, unsigned int fadeout = 0); -int Sound_EffectIsPlaying(int effectID, PHD_3DPOS *position); -float Sound_DistanceToListener(PHD_3DPOS *position); -float Sound_DistanceToListener(Vector3 position); -float Sound_Attenuate(float gain, float distance, float radius); -bool Sound_UpdateEffectPosition(int index, PHD_3DPOS *position, bool force = false); diff --git a/TR5Main/Sound/sound_tracks.h b/TR5Main/Sound/sound_tracks.h new file mode 100644 index 000000000..965d5fbcf --- /dev/null +++ b/TR5Main/Sound/sound_tracks.h @@ -0,0 +1,142 @@ +#pragma once + +enum sound_tracks +{ + CDA_XA1_TL_10B, // TO CLIMB OUT, SWIM TO THE EDGE AND PRESS 'ACTION'. + CDA_XA1_Z10, + CDA_XA1_TL_05, // TO PERFORM A SIDEWAYS SOMERSAULT, PRESS 'LEFT' AND JUMP. + CDA_XA1_TL_08, // FOR ME TO CRAWL, HOLD DOWN 'CROUCH' AND NOW PUSH 'FORWARD'. + CDA_XA1_TL_11, // TO USE THE LEVER SWITCH, STAND NEXT TO THE SWITCH, AND PRESS 'ACTION'. + CDA_XA1_ANDYPEW, + CDA_XA1_SECRET, + CDA_XA1_TL_02, // TO LEAP THE SHORT DISTANCE, WALK TO THE EDGE, NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. + CDA_XA2_HMMM05, + CDA_XA2_TL_01, // TO CLIMB ONTO THIS CRATE, STAND NEXT TO THE CRATE, PUSH 'FORWARD', AND THEN 'ACTION'. + CDA_XA2_ATTACK04, + CDA_XA2_UWATER2B, + CDA_XA2_SPOOKY2A, + CDA_XA2_TL_10A, // TO SWIM, JUMP INTO THE WATER. USE 'ACTION' TO SWIM FORWARD, AND THE DIRECTIONS TO STEER. + CDA_XA2_HMMM02, + CDA_XA2_TOMS01, + CDA_XA3_ATTACK03, + CDA_XA3_ATTACK02, + CDA_XA3_HMMM01, + CDA_XA3_STEALTH1, + CDA_XA3_STEALTH2, + CDA_XA3_ATTACK01, + CDA_XA3_TL_06, // TO MONKEYSWING, JUMP STRAIGHT UP AT THE BARS, AND PRESS AND HOLD 'ACTION', THEN PUSH 'FORWARD'. + CDA_XA3_TL_03, // NOW LET'S TRY A LONGER LEAP. WALK TO THE EDGE, AND TAP 'BACK' ONCE. NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. + CDA_XA4_HMMM06, + CDA_XA4_MIL01, + CDA_XA4_Z_03, + CDA_XA4_HIT01, + CDA_XA4_SPOOKY05, + CDA_XA4_DRAMA01, + CDA_XA4_STEALTH4, + CDA_XA4_MIL05, + CDA_XA5_HMMM04, + CDA_XA5_MIL06, + CDA_XA5_SPOOKY02, + CDA_XA5_TL_12, // TO WALK THE TIGHTROPE, WALK UP TO THE ROPE AND PRESS 'ACTION'. PUSH 'FORWARD'. IF YOU UNBALANCE, PUSH IN THE OPPOSITE DIRECTION TO CORRECT. + CDA_XA5_MIL02A, + CDA_XA5_HMMM03, + CDA_XA5_MIL02, + CDA_XA5_TL_04, // AND NOW FOR THE BIG JUMP. WALK TO THE EDGE, THEN TAP 'BACK' ONCE. NOW PRESS 'FORWARD' AND 'JUMP' TOGETHER. WHEN IN MID-AIR, HOLD 'ACTION' TO GRAB ONTO THE LEDGE. + CDA_XA6_MIL04, + CDA_XA6_SOLO01, + CDA_XA6_Z12, + CDA_XA6_STEALTH3, + CDA_XA6_AUTHSOLO, + CDA_XA6_SPOOKY03, + CDA_XA6_Z13, + CDA_XA6_Z_04ANIM, + CDA_XA7_Z_06A, + CDA_XA7_ANDYOOOH, + CDA_XA7_ANDYOOER, + CDA_XA7_TL_07, // FOR ME TO CLIMB THIS WALL, STAND NEXT TO IT, AND PRESS 'FORWARD' AND 'ACTION' TOGETHER. KEEP HOLD OF 'ACTION' AND PUSH UP TO CLIMB THE WALL. + CDA_XA7_Z_02, + CDA_XA7_EVIBES01, + CDA_XA7_Z_06, + CDA_XA7_AUTHTR, + CDA_XA8_MIL03, + CDA_XA8_FIGHTSC, + CDA_XA8_RICHCUT3, + CDA_XA8_Z_13, + CDA_XA8_Z_08, + CDA_XA8_UWATER2A, + CDA_XA8_JOBYALRM, + CDA_XA8_MIL02B, + CDA_XA9_SWAMPY, + CDA_XA9_EVIBES02, + CDA_XA9_GODS01, + CDA_XA9_Z_03, + CDA_XA9_RICHCUT4, + CDA_XA9_TITLE4, + CDA_XA9_SPOOKY01, + CDA_XA9_CHOPIN01, + CDA_XA10_ECHOIR01, + CDA_XA10_TITLE3, + CDA_XA10_PERC01, + CDA_XA10_VC01, + CDA_XA10_TITLE2, + CDA_XA10_Z_09, + CDA_XA10_SPOOKY04, + CDA_XA10_Z_10, + CDA_XA11_VC01ATV, + CDA_XA11_ANDY3, + CDA_XA11_TITLE1, + CDA_XA11_FLYBY1, + CDA_XA11_MONK_2, + CDA_XA11_ANDY4, + CDA_XA11_FLYBY3, + CDA_XA11_FLYBY2, + CDA_XA12_MOSES01, + CDA_XA12_ANDY4B, + CDA_XA12_Z_10, + CDA_XA12_FLYBY4, + CDA_XA12_RICHCUT1, + CDA_XA12_ANDY5, + CDA_XA12_Z_05, + CDA_XA12_Z_01, + CDA_XA13_JOBY3, + CDA_XA13_ANDY7, + CDA_XA13_ANDREA3B, + CDA_XA13_COSSACK, + CDA_XA13_Z_07, + CDA_XA13_ANDY6, + CDA_XA13_ANDREA3, + CDA_XA13_JOBY7, + CDA_XA14_UWATER1, + CDA_XA14_JOBY1, + CDA_XA14_ANDY10, + CDA_XA14_RICHCUT2, + CDA_XA14_ANDREA1, + CDA_XA14_ANDY8, + CDA_XA14_JOBY6, + CDA_XA14_ECREDITS, + CDA_XA15_BOSS_01, + CDA_XA15_JOBY2, + CDA_XA15_JOBY4, + CDA_XA15_JOBY5, + CDA_XA15_JOBY9, + CDA_XA15_A_ANDY, + CDA_XA15_A_ROME, + CDA_XA15_ANDY2, + CDA_XA16_JOBY8, + CDA_XA16_A_SUB_AMB, + CDA_XA16_JOBY10, + CDA_XA16_A_HARBOUR_OUT, + CDA_XA16_A_ANDY_OUT_NORM, + CDA_XA16_A_ANDY_OUT_SPOOKY, + CDA_XA16_A_ROME_DAY, + CDA_XA16_A_UNDERWATER, + CDA_XA17_A_ROME_NIGHT, + CDA_XA17_A_VC_SAGA, + CDA_XA17_A_INDUSTRY, + CDA_XA17_ANDREA2, + CDA_XA17_ANDY1, + CDA_XA17_ANDREA4, + CDA_XA17_ANDY9, + CDA_XA17_ANDY11, + CDA_XA18_TITLE_MENU +}; \ No newline at end of file diff --git a/TR5Main/Specific/configuration.cpp b/TR5Main/Specific/configuration.cpp index 14da26b3d..f717082e6 100644 --- a/TR5Main/Specific/configuration.cpp +++ b/TR5Main/Specific/configuration.cpp @@ -6,7 +6,7 @@ #include "input.h" #include "GameFlowScript.h" #include "configuration.h" -#include "sound.h" +#include "Sound\sound.h" #include using namespace TEN::Renderer; using std::vector; diff --git a/TR5Main/Specific/input.cpp b/TR5Main/Specific/input.cpp index 2bb3617db..c2b2432da 100644 --- a/TR5Main/Specific/input.cpp +++ b/TR5Main/Specific/input.cpp @@ -3,7 +3,7 @@ #include "Lara.h" #include "winmain.h" #include "camera.h" -#include "sound.h" +#include "Sound\sound.h" #include "savegame.h" using TEN::Renderer::g_Renderer; diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 54da7fb31..d0896366b 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -8,10 +8,10 @@ #include "spotcam.h" #include "camera.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "door.h" #include "box.h" -#include "sound.h" +#include "Sound\sound.h" #include "GameFlowScript.h" #include #include diff --git a/TR5Main/Specific/setup.cpp b/TR5Main/Specific/setup.cpp index 4dd8d4af7..84b1149ba 100644 --- a/TR5Main/Specific/setup.cpp +++ b/TR5Main/Specific/setup.cpp @@ -7,7 +7,7 @@ #include "switch.h" #include "missile.h" #include "control.h" -#include "pickup.h" +#include "pickup\pickup.h" #include "camera.h" #include "lara_one_gun.h" #include "lara_flare.h" diff --git a/TR5Main/Specific/winmain.cpp b/TR5Main/Specific/winmain.cpp index 20685b77e..1295f53b4 100644 --- a/TR5Main/Specific/winmain.cpp +++ b/TR5Main/Specific/winmain.cpp @@ -2,7 +2,7 @@ #include "winmain.h" #include "resource.h" #include "draw.h" -#include "sound.h" +#include "Sound\sound.h" #ifndef NEW_INV #include "inventory.h" #endif diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj index 411dfb603..746e98bb1 100644 --- a/TR5Main/TombEngine.vcxproj +++ b/TR5Main/TombEngine.vcxproj @@ -145,7 +145,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + @@ -422,6 +422,8 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" + + @@ -448,7 +450,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + @@ -465,10 +467,10 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + - + @@ -753,7 +755,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + @@ -769,10 +771,10 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + - + diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters index 9b9ef0ca7..ab922489d 100644 --- a/TR5Main/TombEngine.vcxproj.filters +++ b/TR5Main/TombEngine.vcxproj.filters @@ -36,9 +36,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -57,18 +54,12 @@ File di intestazione - - File di intestazione - File di intestazione File di intestazione - - File di intestazione - File di intestazione @@ -165,9 +156,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -1086,6 +1074,24 @@ File di intestazione + + File di intestazione + + + File di intestazione + + + File di intestazione + + + File di intestazione + + + File di intestazione + + + File di intestazione + @@ -1109,9 +1115,6 @@ File di origine - - File di origine - File di origine @@ -1127,18 +1130,12 @@ File di origine - - File di origine - File di origine File di origine - - File di origine - File di origine @@ -1997,6 +1994,15 @@ File di origine + + File di origine + + + File di origine + + + File di origine +