From cefc60c7ea6b23e71c84ae9705e0e7736aad6d61 Mon Sep 17 00:00:00 2001 From: Lwmte Date: Sun, 19 Sep 2021 23:41:26 +0300 Subject: [PATCH] Move around some files --- TR5Main/Game/Lara/lara_basic.cpp | 2 +- TR5Main/Game/Lara/lara_cheat.cpp | 6 +- TR5Main/Game/Lara/lara_climb.cpp | 2 +- TR5Main/Game/Lara/lara_collide.cpp | 2 +- TR5Main/Game/Lara/lara_crawl.cpp | 4 +- TR5Main/Game/Lara/lara_fire.cpp | 2 +- TR5Main/Game/Lara/lara_hang.cpp | 3 +- TR5Main/Game/Lara/lara_initialise.cpp | 1 - TR5Main/Game/Lara/lara_monkey.cpp | 7 +- TR5Main/Game/Lara/lara_objects.cpp | 4 +- TR5Main/Game/Lara/lara_one_gun.cpp | 6 +- TR5Main/Game/Lara/lara_surface.cpp | 4 +- TR5Main/Game/Lara/lara_swim.cpp | 4 +- TR5Main/Game/Lara/lara_tests.cpp | 2 +- TR5Main/Game/{ => control}/box.cpp | 8 +- TR5Main/Game/{Box.h => control/box.h} | 0 TR5Main/Game/{ => control}/control.cpp | 71 +-------- TR5Main/Game/{ => control}/control.h | 13 +- TR5Main/Game/control/filpmap.cpp | 86 ---------- TR5Main/Game/control/flipmap.h | 12 -- TR5Main/Game/{ => control}/lot.cpp | 4 +- TR5Main/Game/{ => control}/lot.h | 2 +- TR5Main/Game/control/trigger.cpp | 6 +- TR5Main/Game/control/volume.cpp | 1 + TR5Main/Game/control/volume.h | 45 ++++++ TR5Main/Game/effects/bubble.cpp | 2 +- TR5Main/Game/effects/chaffFX.cpp | 2 +- TR5Main/Game/effects/debris.cpp | 2 +- TR5Main/Game/effects/drip.cpp | 2 +- TR5Main/Game/effects/footprint.cpp | 2 +- TR5Main/Game/effects/hair.cpp | 2 +- TR5Main/Game/effects/smoke.cpp | 2 +- TR5Main/Game/flipeffect.cpp | 2 +- TR5Main/Game/flipeffect.h | 2 +- TR5Main/Game/health.cpp | 2 +- TR5Main/Game/inventory.cpp | 2 +- TR5Main/Game/item.h | 56 ------- TR5Main/Game/items.cpp | 5 +- TR5Main/Game/items.h | 58 ++++++- TR5Main/Game/misc.h | 2 +- TR5Main/Game/newinv2.cpp | 2 +- TR5Main/Game/objects.cpp | 4 +- TR5Main/Game/people.h | 2 +- TR5Main/Game/pickup/pickup.cpp | 2 +- TR5Main/Game/puzzles_keys.cpp | 2 +- TR5Main/Game/room.cpp | 147 ++++++++++++++++++ TR5Main/Game/room.h | 61 ++------ TR5Main/Game/rope.cpp | 2 +- TR5Main/Game/savegame.cpp | 6 +- TR5Main/Game/spotcam.cpp | 2 +- TR5Main/Game/switch.cpp | 2 +- TR5Main/Game/traps.cpp | 2 +- TR5Main/Objects/Effects/tr4_bubbles.cpp | 2 +- TR5Main/Objects/Effects/tr5_electricity.cpp | 2 +- .../Objects/Generic/Doors/double_doors.cpp | 6 +- .../Objects/Generic/Doors/generic_doors.cpp | 6 +- .../Generic/Doors/pushpull_kick_door.cpp | 6 +- .../Objects/Generic/Doors/sequence_door.cpp | 6 +- TR5Main/Objects/Generic/Doors/steel_door.cpp | 6 +- .../Objects/Generic/Doors/underwater_door.cpp | 6 +- .../Generic/Object/generic_trapdoor.cpp | 2 +- .../Objects/Generic/Object/generic_trapdoor.h | 2 +- .../Objects/Generic/Switches/cog_switch.cpp | 4 +- .../Generic/Switches/generic_switch.cpp | 2 +- .../Objects/Generic/Switches/jump_switch.cpp | 2 +- .../Generic/Switches/pulley_switch.cpp | 2 +- .../Objects/Generic/Switches/turn_switch.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_ape.cpp | 4 +- TR5Main/Objects/TR1/Entity/tr1_bear.cpp | 6 +- TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp | 4 +- TR5Main/Objects/TR1/Entity/tr1_centaur.cpp | 10 +- .../Objects/TR1/Entity/tr1_doppelganger.cpp | 2 +- .../Objects/TR1/Entity/tr1_giant_mutant.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_natla.cpp | 2 +- TR5Main/Objects/TR1/Entity/tr1_wolf.cpp | 6 +- TR5Main/Objects/TR1/tr1_objects.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp | 2 +- .../Objects/TR2/Entity/tr2_birdmonster.cpp | 4 +- TR5Main/Objects/TR2/Entity/tr2_dragon.cpp | 4 +- .../Objects/TR2/Entity/tr2_eagle_or_crow.cpp | 2 +- .../Objects/TR2/Entity/tr2_knifethrower.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp | 4 +- TR5Main/Objects/TR2/Entity/tr2_monk.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_rat.cpp | 6 +- TR5Main/Objects/TR2/Entity/tr2_shark.cpp | 4 +- TR5Main/Objects/TR2/Entity/tr2_silencer.cpp | 4 +- TR5Main/Objects/TR2/Entity/tr2_skidman.cpp | 4 +- .../Objects/TR2/Entity/tr2_spear_guardian.cpp | 2 +- TR5Main/Objects/TR2/Entity/tr2_spider.cpp | 6 +- .../Objects/TR2/Entity/tr2_sword_guardian.cpp | 4 +- .../TR2/Entity/tr2_worker_dualrevolver.cpp | 2 +- .../TR2/Entity/tr2_worker_flamethrower.cpp | 4 +- .../TR2/Entity/tr2_worker_machinegun.cpp | 4 +- .../Objects/TR2/Entity/tr2_worker_shotgun.cpp | 4 +- TR5Main/Objects/TR2/Entity/tr2_yeti.cpp | 4 +- TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp | 2 +- .../Objects/TR2/Trap/tr2_spinningblade.cpp | 2 +- TR5Main/Objects/TR2/tr2_objects.cpp | 2 +- TR5Main/Objects/TR3/Entity/tr3_civvy.cpp | 2 +- TR5Main/Objects/TR3/Entity/tr3_cobra.cpp | 2 +- .../Objects/TR3/Entity/tr3_fishemitter.cpp | 2 +- .../Objects/TR3/Entity/tr3_flamethrower.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_monkey.cpp | 6 +- TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_raptor.cpp | 6 +- TR5Main/Objects/TR3/Entity/tr3_scuba.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_shiva.cpp | 2 +- TR5Main/Objects/TR3/Entity/tr3_sophia.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_tiger.cpp | 6 +- TR5Main/Objects/TR3/Entity/tr3_tony.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_trex.cpp | 4 +- TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp | 2 +- TR5Main/Objects/TR3/Trap/train.cpp | 2 +- TR5Main/Objects/TR3/Vehicles/kayak.cpp | 2 +- TR5Main/Objects/TR3/Vehicles/upv.cpp | 2 +- TR5Main/Objects/TR3/tr3_objects.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_baboon.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_baddy.cpp | 10 +- TR5Main/Objects/TR4/Entity/tr4_bat.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp | 2 +- .../Objects/TR4/Entity/tr4_bigscorpion.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_demigod.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_dog.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_guide.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_harpy.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_horseman.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp | 2 +- .../Objects/TR4/Entity/tr4_knighttemplar.cpp | 2 +- .../Objects/TR4/Entity/tr4_littlebeetle.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_mummy.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_mutant.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_sas.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_setha.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp | 4 +- .../Objects/TR4/Entity/tr4_smallscorpion.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp | 2 +- TR5Main/Objects/TR4/Entity/tr4_troops.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp | 4 +- TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp | 6 +- TR5Main/Objects/TR4/Entity/tr4_wraith.cpp | 2 +- .../Objects/TR4/Object/tr4_element_puzzle.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_laradouble.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_mapper.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_obelisk.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_scales.cpp | 2 +- TR5Main/Objects/TR4/Object/tr4_senet.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_blade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_chain.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_cog.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_hammer.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_plough.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp | 2 +- TR5Main/Objects/TR4/Trap/tr4_stargate.cpp | 2 +- TR5Main/Objects/TR4/Vehicles/motorbike.cpp | 2 +- TR5Main/Objects/TR4/tr4_objects.cpp | 2 +- .../Objects/TR5/Emitter/tr5_bats_emitter.cpp | 2 +- .../Objects/TR5/Emitter/tr5_rats_emitter.cpp | 2 +- .../TR5/Emitter/tr5_spider_emitter.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_chef.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_doberman.cpp | 4 +- TR5Main/Objects/TR5/Entity/tr5_dog.cpp | 6 +- TR5Main/Objects/TR5/Entity/tr5_ghost.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_guard.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_hydra.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_imp.cpp | 4 +- .../Objects/TR5/Entity/tr5_lagoon_witch.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_larson.cpp | 4 +- TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp | 2 +- TR5Main/Objects/TR5/Entity/tr5_lion.cpp | 6 +- TR5Main/Objects/TR5/Entity/tr5_reaper.cpp | 4 +- .../Objects/TR5/Entity/tr5_roman_statue.cpp | 4 +- TR5Main/Objects/TR5/Entity/tr5_submarine.cpp | 2 +- TR5Main/Objects/TR5/Object/tr5_bodypart.cpp | 2 +- .../TR5/Object/tr5_expandingplatform.cpp | 4 +- TR5Main/Objects/TR5/Object/tr5_genslot.cpp | 2 +- TR5Main/Objects/TR5/Object/tr5_highobject.cpp | 2 +- TR5Main/Objects/TR5/Object/tr5_missile.cpp | 2 +- .../Objects/TR5/Object/tr5_pushableblock.cpp | 2 +- .../Objects/TR5/Object/tr5_raisingblock.cpp | 4 +- .../Objects/TR5/Object/tr5_rollingball.cpp | 2 +- TR5Main/Objects/TR5/Object/tr5_teleporter.cpp | 4 +- .../TR5/Object/tr5_twoblockplatform.cpp | 2 +- .../Objects/TR5/Shatter/tr5_smashobject.cpp | 2 +- .../TR5/Switch/tr5_crowdove_switch.cpp | 2 +- TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp | 2 +- TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp | 2 +- TR5Main/Objects/TR5/Trap/tr5_explosion.cpp | 4 +- .../Objects/TR5/Trap/tr5_fallingceiling.cpp | 2 +- TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp | 2 +- TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp | 2 +- TR5Main/Objects/TR5/tr5_objects.cpp | 2 +- TR5Main/Renderer/Render11Helper.cpp | 2 +- TR5Main/Renderer/Renderer11Compatibility.cpp | 2 +- TR5Main/Renderer/Renderer11Draw.cpp | 2 +- TR5Main/Renderer/Renderer11Draw2D.cpp | 2 +- TR5Main/Renderer/Renderer11DrawEffect.cpp | 4 +- TR5Main/Renderer/Renderer11Lara.cpp | 2 +- TR5Main/Scripting/GameLogicScript.cpp | 4 +- TR5Main/Scripting/GameScriptItemInfo.cpp | 2 +- TR5Main/Sound/sound.cpp | 2 +- TR5Main/Sound/sound.h | 2 +- TR5Main/Specific/level.cpp | 7 +- TR5Main/Specific/level.h | 2 +- TR5Main/Specific/setup.cpp | 2 +- TR5Main/Specific/winmain.cpp | 2 +- TR5Main/TombEngine.vcxproj | 15 +- TR5Main/TombEngine.vcxproj.filters | 45 +++--- 225 files changed, 625 insertions(+), 656 deletions(-) rename TR5Main/Game/{ => control}/box.cpp (99%) rename TR5Main/Game/{Box.h => control/box.h} (100%) rename TR5Main/Game/{ => control}/control.cpp (94%) rename TR5Main/Game/{ => control}/control.h (91%) delete mode 100644 TR5Main/Game/control/filpmap.cpp delete mode 100644 TR5Main/Game/control/flipmap.h rename TR5Main/Game/{ => control}/lot.cpp (99%) rename TR5Main/Game/{ => control}/lot.h (92%) delete mode 100644 TR5Main/Game/item.h diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index 90d722572..aa5f331dd 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -12,7 +12,7 @@ #include "animation.h" #include "pickup.h" #include "collide.h" -#include "item.h" +#include "items.h" #include "camera.h" /*generic functions*/ diff --git a/TR5Main/Game/Lara/lara_cheat.cpp b/TR5Main/Game/Lara/lara_cheat.cpp index 2d0b4cf12..40fae3ea3 100644 --- a/TR5Main/Game/Lara/lara_cheat.cpp +++ b/TR5Main/Game/Lara/lara_cheat.cpp @@ -6,10 +6,10 @@ #ifndef NEW_INV #include "inventory.h" #endif -#include "effects\effects.h" -#include "Sound\sound.h" +#include "effects/effects.h" +#include "Sound/sound.h" #include "collide.h" -#include "item.h" +#include "items.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Game/Lara/lara_climb.cpp b/TR5Main/Game/Lara/lara_climb.cpp index 19fab465d..2d65957e0 100644 --- a/TR5Main/Game/Lara/lara_climb.cpp +++ b/TR5Main/Game/Lara/lara_climb.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "lara_climb.h" #include "Lara.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "sphere.h" #include "camera.h" diff --git a/TR5Main/Game/Lara/lara_collide.cpp b/TR5Main/Game/Lara/lara_collide.cpp index fb27e8ce6..aa1ce0144 100644 --- a/TR5Main/Game/Lara/lara_collide.cpp +++ b/TR5Main/Game/Lara/lara_collide.cpp @@ -5,7 +5,7 @@ #include "animation.h" #include "effects/effects.h" #include "collide.h" -#include "control.h" +#include "control/control.h" #include "lara_collide.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 7d6b2354e..528e2f02d 100644 --- a/TR5Main/Game/Lara/lara_crawl.cpp +++ b/TR5Main/Game/Lara/lara_crawl.cpp @@ -8,9 +8,9 @@ #include "control/los.h" #include "Lara/lara_flare.h" #include "collide.h" -#include "item.h" +#include "items.h" #include "camera.h" -#include "control.h" +#include "control/control.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 dee4568df..301b1d9ee 100644 --- a/TR5Main/Game/Lara/lara_fire.cpp +++ b/TR5Main/Game/Lara/lara_fire.cpp @@ -11,7 +11,7 @@ #include "animation.h" #include "effects\flmtorch.h" #include "level.h" -#include "lot.h" +#include "control/lot.h" #include "setup.h" #include "input.h" #include "Sound\sound.h" diff --git a/TR5Main/Game/Lara/lara_hang.cpp b/TR5Main/Game/Lara/lara_hang.cpp index 339190027..66daa76e8 100644 --- a/TR5Main/Game/Lara/lara_hang.cpp +++ b/TR5Main/Game/Lara/lara_hang.cpp @@ -2,10 +2,11 @@ #include "lara.h" #include "input.h" #include "lara_tests.h" -#include "item.h" +#include "items.h" #include "collide.h" #include "camera.h" #include "level.h" + /*this file has all the lara_as/lara_col functions related to hanging*/ /*normal hanging and shimmying*/ diff --git a/TR5Main/Game/Lara/lara_initialise.cpp b/TR5Main/Game/Lara/lara_initialise.cpp index 64c2db18b..8be932438 100644 --- a/TR5Main/Game/Lara/lara_initialise.cpp +++ b/TR5Main/Game/Lara/lara_initialise.cpp @@ -2,7 +2,6 @@ #include "lara.h" #include "lara_initialise.h" #include "health.h" -#include "item.h" #include "items.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Game/Lara/lara_monkey.cpp b/TR5Main/Game/Lara/lara_monkey.cpp index 4daadb902..1da39c083 100644 --- a/TR5Main/Game/Lara/lara_monkey.cpp +++ b/TR5Main/Game/Lara/lara_monkey.cpp @@ -1,16 +1,17 @@ #include "framework.h" #include "lara.h" #include "input.h" -#include "control.h" +#include "control/control.h" #include "lara_collide.h" #include "lara_tests.h" #include "lara_monkey.h" #include "floordata.h" #include "collide.h" -#include "item.h" +#include "items.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "level.h" + using namespace TEN::Floordata; /*this file has all the related functions to monkeyswinging*/ diff --git a/TR5Main/Game/Lara/lara_objects.cpp b/TR5Main/Game/Lara/lara_objects.cpp index 1b522fe65..240a51544 100644 --- a/TR5Main/Game/Lara/lara_objects.cpp +++ b/TR5Main/Game/Lara/lara_objects.cpp @@ -7,8 +7,8 @@ #include "rope.h" #include "camera.h" #include "collide.h" -#include "item.h" -#include "control.h" +#include "items.h" +#include "control/control.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 918a4040d..81c746d52 100644 --- a/TR5Main/Game/Lara/lara_one_gun.cpp +++ b/TR5Main/Game/Lara/lara_one_gun.cpp @@ -4,11 +4,11 @@ #include "Lara.h" #include "lara_fire.h" #include "animation.h" -#include "box.h" -#include "control.h" +#include "control/box.h" +#include "control/control.h" #include "effects\effects.h" #include "effects\tomb4fx.h" -#include "lot.h" +#include "control/lot.h" #include "collide.h" #include "effects\debris.h" #include "effects\weather.h" diff --git a/TR5Main/Game/Lara/lara_surface.cpp b/TR5Main/Game/Lara/lara_surface.cpp index ba9e89e14..c59eff721 100644 --- a/TR5Main/Game/Lara/lara_surface.cpp +++ b/TR5Main/Game/Lara/lara_surface.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "lara_surface.h" #include "lara_tests.h" -#include "control.h" +#include "control/control.h" #include "camera.h" #include "collide.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "Lara.h" #include "lara_swim.h" #include "lara_fire.h" diff --git a/TR5Main/Game/Lara/lara_swim.cpp b/TR5Main/Game/Lara/lara_swim.cpp index d7d73dc89..5165b4348 100644 --- a/TR5Main/Game/Lara/lara_swim.cpp +++ b/TR5Main/Game/Lara/lara_swim.cpp @@ -1,9 +1,9 @@ #include "framework.h" #include "lara_swim.h" -#include "control.h" +#include "control/control.h" #include "camera.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "Lara.h" #include "lara_surface.h" #include "effects\effects.h" diff --git a/TR5Main/Game/Lara/lara_tests.cpp b/TR5Main/Game/Lara/lara_tests.cpp index 40b85a846..e61866227 100644 --- a/TR5Main/Game/Lara/lara_tests.cpp +++ b/TR5Main/Game/Lara/lara_tests.cpp @@ -6,7 +6,7 @@ #include "animation.h" #include "lara_climb.h" #include "lara_collide.h" -#include "control.h" +#include "control/control.h" #include "control\los.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/box.cpp b/TR5Main/Game/control/box.cpp similarity index 99% rename from TR5Main/Game/box.cpp rename to TR5Main/Game/control/box.cpp index b65ce4589..64f071356 100644 --- a/TR5Main/Game/box.cpp +++ b/TR5Main/Game/control/box.cpp @@ -1,13 +1,13 @@ #include "framework.h" -#include "box.h" +#include "control/box.h" #include "effects/tomb4fx.h" -#include "lot.h" +#include "control/lot.h" #include "Lara.h" #include "animation.h" #include "sphere.h" #include "camera.h" -#include "control.h" -#include "control/flipmap.h" +#include "control/control.h" +#include "room.h" #include "setup.h" #include "Specific/trmath.h" #include "objectslist.h" diff --git a/TR5Main/Game/Box.h b/TR5Main/Game/control/box.h similarity index 100% rename from TR5Main/Game/Box.h rename to TR5Main/Game/control/box.h diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control/control.cpp similarity index 94% rename from TR5Main/Game/control.cpp rename to TR5Main/Game/control/control.cpp index 3bf98634c..850923110 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control/control.cpp @@ -2,7 +2,7 @@ #include #include "winmain.h" #include "collide.h" -#include "control.h" +#include "control/control.h" #include "pickup.h" #include "camera.h" #include "Lara.h" @@ -14,17 +14,18 @@ #else #include "inventory.h" #endif -#include "lot.h" +#include "control/lot.h" #include "health.h" #include "savegame.h" #include "Sound/sound.h" #include "spotcam.h" -#include "box.h" +#include "control/box.h" #include "objects.h" #include "sphere.h" #include "level.h" #include "input.h" #include "setup.h" +#include "room.h" #include "effects/effects.h" #include "effects/tomb4fx.h" #include "effects/debris.h" @@ -42,7 +43,6 @@ #include "particle/SimpleParticle.h" #include "Specific/prng.h" #include "Specific/clock.h" -#include "control/flipmap.h" #include "Lara/lara_one_gun.h" #include "generic_switch.h" #include "Scripting/GameFlowScript.h" @@ -96,9 +96,6 @@ int LastInventoryItem; extern Inventory g_Inventory; #endif -short IsRoomOutsideNo; -std::vector OutsideRoomTable[OUTSIDE_SIZE][OUTSIDE_SIZE]; - int DrawPhase() { g_Renderer.Draw(); @@ -1083,66 +1080,6 @@ int GetWaterHeight(int x, int y, int z, short roomNumber) return NO_HEIGHT; } -int IsObjectInRoom(short roomNumber, short objectNumber) -{ - short itemNumber = g_Level.Rooms[roomNumber].itemNumber; - - if (itemNumber == NO_ITEM) - return 0; - - while (true) - { - ITEM_INFO *item = &g_Level.Items[itemNumber]; - - if (item->objectNumber == objectNumber) - break; - - itemNumber = item->nextItem; - - if (itemNumber == NO_ITEM) - return 0; - } - - return 1; -} - -int IsRoomOutside(int x, int y, int z) -{ - if (x < 0 || z < 0) - return -2; - - int xTable = x / 1024; - int zTable = z / 1024; - - if (OutsideRoomTable[xTable][zTable].size() == 0) - return -2; - - for (size_t i = 0; i < OutsideRoomTable[xTable][zTable].size(); i++) - { - short roomNumber = OutsideRoomTable[xTable][zTable][i]; - ROOM_INFO* r = &g_Level.Rooms[roomNumber]; - - if ((y > r->maxceiling) && (y < r->minfloor) - && ((z > (r->z + 1024)) && (z < (r->z + ((r->xSize - 1) * 1024)))) - && ((x > (r->x + 1024)) && (x < (r->x + ((r->ySize - 1) * 1024))))) - { - IsRoomOutsideNo = roomNumber; - - FLOOR_INFO* floor = GetFloor(x, y, z, &roomNumber); - int height = GetFloorHeight(floor, x, y, z); - if (height == NO_HEIGHT || y > height) - return -2; - height = GetCeiling(floor, x, y, z); - if (y < height) - return -2; - - return ((r->flags & (ENV_FLAG_WIND | ENV_FLAG_WATER)) != 0 ? 1 : -3); - } - } - - return -2; -} - void ResetGlobals() { // Reset oscillator seed diff --git a/TR5Main/Game/control.h b/TR5Main/Game/control/control.h similarity index 91% rename from TR5Main/Game/control.h rename to TR5Main/Game/control/control.h index 7a4df0f7a..85fd6cd5b 100644 --- a/TR5Main/Game/control.h +++ b/TR5Main/Game/control/control.h @@ -34,10 +34,6 @@ enum HEADINGS WEST }; -#define OUTSIDE_Z 64 -#define OUTSIDE_SIZE 108 - - extern int GameTimer; extern int RumbleTimer; extern int InGameCounter; @@ -86,9 +82,7 @@ int GetRandomDraw(); void KillMoveItems(); void KillMoveEffects(); void UpdateShatters(); - -int IsObjectInRoom(short roomNumber, short objectNumber); -int IsRoomOutside(int x, int y, int z); +int ExplodeItemNode(ITEM_INFO* item, int Node, int NoXZVel, int bits); void RumbleScreen(); void RefreshCamera(short type, short* data); @@ -98,10 +92,7 @@ void ResetGlobals(); void AlterFloorHeight(ITEM_INFO* item, int height); int GetFloorHeight(FLOOR_INFO* floor, int x, int y, int z); FLOOR_INFO* GetFloor(int x, int y, int z, short* roomNumber); -int GetCeiling(FLOOR_INFO* floor, int x, int y, int z); - -int ExplodeItemNode(ITEM_INFO* item, int Node, int NoXZVel, int bits); - +int GetCeiling(FLOOR_INFO* floor, int x, int y, int z); int GetWaterSurface(int x, int y, int z, short roomNumber); int GetWaterHeight(int x, int y, int z, short roomNumber); diff --git a/TR5Main/Game/control/filpmap.cpp b/TR5Main/Game/control/filpmap.cpp deleted file mode 100644 index 6c23dcc18..000000000 --- a/TR5Main/Game/control/filpmap.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "framework.h" -#include "flipmap.h" -#include "lot.h" -#include "Renderer11.h" - -using namespace TEN::Renderer; - -byte FlipStatus = 0; -int FlipStats[MAX_FLIPMAP]; -int FlipMap[MAX_FLIPMAP]; - - -void DoFlipMap(short group) -{ - ROOM_INFO temp; - - for (size_t i = 0; i < g_Level.Rooms.size(); i++) - { - ROOM_INFO* r = &g_Level.Rooms[i]; - - if (r->flippedRoom >= 0 && r->flipNumber == group) - { - RemoveRoomFlipItems(r); - - ROOM_INFO* flipped = &g_Level.Rooms[r->flippedRoom]; - - temp = *r; - *r = *flipped; - *flipped = temp; - - r->flippedRoom = flipped->flippedRoom; - flipped->flippedRoom = -1; - - r->itemNumber = flipped->itemNumber; - r->fxNumber = flipped->fxNumber; - - AddRoomFlipItems(r); - - g_Renderer.flipRooms(static_cast(i), r->flippedRoom); - - for (auto& fd : r->floor) - fd.Room = i; - for (auto& fd : flipped->floor) - fd.Room = r->flippedRoom; - } - } - - int status = FlipStats[group] == 0; - FlipStats[group] = status; - FlipStatus = status; - - for (int i = 0; i < ActiveCreatures.size(); i++) - { - ActiveCreatures[i]->LOT.targetBox = NO_BOX; - } -} - -void AddRoomFlipItems(ROOM_INFO* r) -{ - for (short linkNum = r->itemNumber; linkNum != NO_ITEM; linkNum = g_Level.Items[linkNum].nextItem) - { - ITEM_INFO* item = &g_Level.Items[linkNum]; - - //if (item->objectNumber == ID_RAISING_BLOCK1 && item->itemFlags[1]) - // AlterFloorHeight(item, -1024); - - if (item->objectNumber == ID_RAISING_BLOCK2) - { - //if (item->itemFlags[1]) - // AlterFloorHeight(item, -2048); - } - } -} - -void RemoveRoomFlipItems(ROOM_INFO* r) -{ - for (short linkNum = r->itemNumber; linkNum != NO_ITEM; linkNum = g_Level.Items[linkNum].nextItem) - { - ITEM_INFO* item = &g_Level.Items[linkNum]; - - if (item->flags & 0x100 && Objects[item->objectNumber].intelligent && item->hitPoints <= 0 && item->hitPoints != NOT_TARGETABLE) - { - KillItem(linkNum); - } - } -} diff --git a/TR5Main/Game/control/flipmap.h b/TR5Main/Game/control/flipmap.h deleted file mode 100644 index bc1965517..000000000 --- a/TR5Main/Game/control/flipmap.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "room.h" - -constexpr auto MAX_FLIPMAP = 255; - -extern byte FlipStatus; -extern int FlipStats[MAX_FLIPMAP]; -extern int FlipMap[MAX_FLIPMAP]; - -void DoFlipMap(short group); -void AddRoomFlipItems(ROOM_INFO* r); -void RemoveRoomFlipItems(ROOM_INFO* r); \ No newline at end of file diff --git a/TR5Main/Game/lot.cpp b/TR5Main/Game/control/lot.cpp similarity index 99% rename from TR5Main/Game/lot.cpp rename to TR5Main/Game/control/lot.cpp index 7e90af06a..18ffa8a86 100644 --- a/TR5Main/Game/lot.cpp +++ b/TR5Main/Game/control/lot.cpp @@ -1,6 +1,6 @@ #include "framework.h" -#include "lot.h" -#include "box.h" +#include "control/lot.h" +#include "control/box.h" #include "setup.h" #include "camera.h" #include "lara.h" diff --git a/TR5Main/Game/lot.h b/TR5Main/Game/control/lot.h similarity index 92% rename from TR5Main/Game/lot.h rename to TR5Main/Game/control/lot.h index e828e2a3b..cd38d5ebe 100644 --- a/TR5Main/Game/lot.h +++ b/TR5Main/Game/control/lot.h @@ -1,5 +1,5 @@ #pragma once -#include "box.h" +#include "control/box.h" extern std::vector ActiveCreatures; diff --git a/TR5Main/Game/control/trigger.cpp b/TR5Main/Game/control/trigger.cpp index 3b6522503..c50a7e8ed 100644 --- a/TR5Main/Game/control/trigger.cpp +++ b/TR5Main/Game/control/trigger.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "items.h" -#include "control/flipmap.h" +#include "room.h" #include "floordata.h" #include "flipeffect.h" #include "objectslist.h" -#include "box.h" +#include "control/box.h" #include "camera.h" #include "puzzles_keys.h" #include "pickup.h" -#include "lot.h" +#include "control/lot.h" #include "spotcam.h" #include "Sound\sound.h" #include "traps.h" diff --git a/TR5Main/Game/control/volume.cpp b/TR5Main/Game/control/volume.cpp index 1c214bbb5..20a63001f 100644 --- a/TR5Main/Game/control/volume.cpp +++ b/TR5Main/Game/control/volume.cpp @@ -1,4 +1,5 @@ #include "framework.h" +#include "volume.h" #include "room.h" #include "setup.h" #include "lara.h" diff --git a/TR5Main/Game/control/volume.h b/TR5Main/Game/control/volume.h index eeff959e5..1009f9db3 100644 --- a/TR5Main/Game/control/volume.h +++ b/TR5Main/Game/control/volume.h @@ -4,6 +4,51 @@ #include "setup.h" #include "Renderer11.h" +enum TriggerStatus +{ + TS_OUTSIDE = 0, + TS_ENTERING = 1, + TS_INSIDE = 2, + TS_LEAVING = 3 +}; + +enum TriggerVolumeType +{ + VOLUME_BOX = 0, + VOLUME_SPHERE = 1, + VOLUME_PRISM = 2 // Unsupported as of now +}; + +enum TriggerVolumeActivators +{ + PLAYER = 1, + NPC = 2, + MOVEABLES = 4, + STATICS = 8, + FLYBYS = 16, + PHYSICALOBJECTS = 32 // Future-proofness for Bullet +}; + +struct TRIGGER_VOLUME +{ + TriggerVolumeType type; + + Vector3 position; + Quaternion rotation; + Vector3 scale; // X used as radius if type is VOLUME_SPHERE + + std::string onEnter; + std::string onInside; + std::string onLeave; + + int activators; + bool oneShot; + + TriggerStatus status; + BoundingOrientedBox box; + BoundingSphere sphere; +}; + namespace TEN::Control::Volumes { extern int CurrentCollidedVolume; diff --git a/TR5Main/Game/effects/bubble.cpp b/TR5Main/Game/effects/bubble.cpp index d7355ce89..e2c2018c8 100644 --- a/TR5Main/Game/effects/bubble.cpp +++ b/TR5Main/Game/effects/bubble.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "effects\bubble.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific\trmath.h" #include "objectslist.h" #include "setup.h" diff --git a/TR5Main/Game/effects/chaffFX.cpp b/TR5Main/Game/effects/chaffFX.cpp index abb2b8b4b..9c8c7b2e9 100644 --- a/TR5Main/Game/effects/chaffFX.cpp +++ b/TR5Main/Game/effects/chaffFX.cpp @@ -2,7 +2,7 @@ #include "chaffFX.h" #include "effects\bubble.h" #include "effects\tomb4fx.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "animation.h" #include "level.h" diff --git a/TR5Main/Game/effects/debris.cpp b/TR5Main/Game/effects/debris.cpp index de92057d3..1a88ad2af 100644 --- a/TR5Main/Game/effects/debris.cpp +++ b/TR5Main/Game/effects/debris.cpp @@ -2,7 +2,7 @@ #include "effects\debris.h" #include "level.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "Specific\trmath.h" #include "Specific\prng.h" diff --git a/TR5Main/Game/effects/drip.cpp b/TR5Main/Game/effects/drip.cpp index 7f80ccb16..e003b2453 100644 --- a/TR5Main/Game/effects/drip.cpp +++ b/TR5Main/Game/effects/drip.cpp @@ -2,7 +2,7 @@ #include "drip.h" #include #include -#include "control.h" +#include "control/control.h" #include "level.h" #include "room.h" #include "Specific\trmath.h" diff --git a/TR5Main/Game/effects/footprint.cpp b/TR5Main/Game/effects/footprint.cpp index c10d77db0..223fe5e25 100644 --- a/TR5Main/Game/effects/footprint.cpp +++ b/TR5Main/Game/effects/footprint.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "animation.h" #include "effects\groundfx.h" diff --git a/TR5Main/Game/effects/hair.cpp b/TR5Main/Game/effects/hair.cpp index 406c0b393..5d571f8f9 100644 --- a/TR5Main/Game/effects/hair.cpp +++ b/TR5Main/Game/effects/hair.cpp @@ -3,7 +3,7 @@ #include "animation.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "GameFlowScript.h" #include "setup.h" #include "sphere.h" diff --git a/TR5Main/Game/effects/smoke.cpp b/TR5Main/Game/effects/smoke.cpp index 14cacdacf..90d5bfcfb 100644 --- a/TR5Main/Game/effects/smoke.cpp +++ b/TR5Main/Game/effects/smoke.cpp @@ -3,7 +3,7 @@ #include "Specific\trmath.h" #include "smoke.h" #include "room.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "setup.h" #include "lara.h" diff --git a/TR5Main/Game/flipeffect.cpp b/TR5Main/Game/flipeffect.cpp index 86f636b01..a212aec42 100644 --- a/TR5Main/Game/flipeffect.cpp +++ b/TR5Main/Game/flipeffect.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "flipeffect.h" #include "Lara.h" -#include "lot.h" +#include "control/lot.h" #include "effects\hair.h" #include "animation.h" #include "sphere.h" diff --git a/TR5Main/Game/flipeffect.h b/TR5Main/Game/flipeffect.h index 0d55bcb76..e27c1744a 100644 --- a/TR5Main/Game/flipeffect.h +++ b/TR5Main/Game/flipeffect.h @@ -1,6 +1,6 @@ #pragma once #include "items.h" -#include "control.h" +#include "control/control.h" #define EffectFunction void(ITEM_INFO* item) diff --git a/TR5Main/Game/health.cpp b/TR5Main/Game/health.cpp index 739ce2589..778c96d89 100644 --- a/TR5Main/Game/health.cpp +++ b/TR5Main/Game/health.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "camera.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Renderer11.h" using namespace TEN::Renderer; short PickupX; diff --git a/TR5Main/Game/inventory.cpp b/TR5Main/Game/inventory.cpp index c738aae6d..682b6374e 100644 --- a/TR5Main/Game/inventory.cpp +++ b/TR5Main/Game/inventory.cpp @@ -2,7 +2,7 @@ #ifndef NEW_INV #include "inventory.h" #include "animation.h" -#include "control.h" +#include "control/control.h" #include "lara_fire.h" #include "gameflow.h" #include "Sound\sound.h" diff --git a/TR5Main/Game/item.h b/TR5Main/Game/item.h deleted file mode 100644 index 4f3317377..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; - uint16_t 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 1cf11b0f2..f760a37e9 100644 --- a/TR5Main/Game/items.cpp +++ b/TR5Main/Game/items.cpp @@ -3,10 +3,9 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "floordata.h" -#include "effects\effects.h" -#include "Game\box.h" +#include "effects/effects.h" using namespace TEN::Floordata; diff --git a/TR5Main/Game/items.h b/TR5Main/Game/items.h index 91cc127f8..dc55b7230 100644 --- a/TR5Main/Game/items.h +++ b/TR5Main/Game/items.h @@ -1,7 +1,9 @@ #pragma once -#include "Specific\phd_global.h" -#include "item.h" #include +#include "Specific\phd_global.h" +#include "itemdata\itemdata.h" + +enum GAME_OBJECT_ID : short; enum AIObjectType { @@ -32,8 +34,54 @@ enum ItemFlags IFLAG_ACTIVATION_MASK = 0x3E00 // bits 9-13 }; - - +struct ITEM_INFO +{ + int floor; + uint32_t touchBits; + uint32_t meshBits; + GAME_OBJECT_ID objectNumber; + short currentAnimState; + short goalAnimState; + short requiredAnimState; + short animNumber; + short frameNumber; + short roomNumber; + ROOM_VECTOR location; + short nextItem; + short nextActive; + short speed; + short fallspeed; + short hitPoints; + int boxNumber; + short timer; + uint16_t flags; // ItemFlags enum + short shade; + uint16_t triggerFlags; + short carriedItem; + short afterDeath; + short firedWeapon; + short itemFlags[8]; + ITEM_DATA data; + PHD_3DPOS pos; + bool active; + short status; // ItemStatus enum + bool gravityStatus; + bool hitStatus; + bool collidable; + bool lookedAt; + bool dynamicLight; + bool poisoned; + uint8_t aiBits; // AIObjectType enum + bool reallyActive; + bool inDrawRoom; + bool friendly; + uint32_t swapMeshFlags; + short drawRoom; + short TOSSPAD; + PHD_3DPOS startPos; + short locationAI; + std::string luaName; +}; // used by fx->shade ! #define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F) @@ -44,7 +92,7 @@ enum ItemFlags constexpr auto NO_ITEM = -1; constexpr auto ALL_MESHBITS = -1; constexpr auto NOT_TARGETABLE = -16384; -#define NUM_ITEMS 1024 +constexpr auto NUM_ITEMS = 1024; void EffectNewRoom(short fxNumber, short roomNumber); void ItemNewRoom(short itemNum, short roomNumber); diff --git a/TR5Main/Game/misc.h b/TR5Main/Game/misc.h index f4bef0210..a1377b4dc 100644 --- a/TR5Main/Game/misc.h +++ b/TR5Main/Game/misc.h @@ -1,6 +1,6 @@ #pragma once -#include "box.h" +#include "control/box.h" #define CHK_ANY(var, flag) (var & flag) != 0 #define CHK_EXI(var, flag) var & flag diff --git a/TR5Main/Game/newinv2.cpp b/TR5Main/Game/newinv2.cpp index 981e6aa18..c2692ad75 100644 --- a/TR5Main/Game/newinv2.cpp +++ b/TR5Main/Game/newinv2.cpp @@ -2,7 +2,7 @@ #ifdef NEW_INV #include "newinv2.h" #include "animation.h" -#include "control.h" +#include "control/control.h" #include "lara_fire.h" #include "gameflow.h" #include "Sound\sound.h" diff --git a/TR5Main/Game/objects.cpp b/TR5Main/Game/objects.cpp index 12bee1f45..a61f9770f 100644 --- a/TR5Main/Game/objects.cpp +++ b/TR5Main/Game/objects.cpp @@ -6,9 +6,9 @@ #include "Lara.h" #include "sphere.h" #include "effects\debris.h" -#include "control.h" +#include "control/control.h" #include "switch.h" -#include "box.h" +#include "control/box.h" #include "setup.h" #include "effects\tomb4fx.h" #include "level.h" diff --git a/TR5Main/Game/people.h b/TR5Main/Game/people.h index 41a13518f..c5366dba1 100644 --- a/TR5Main/Game/people.h +++ b/TR5Main/Game/people.h @@ -1,6 +1,6 @@ #pragma once -#include "box.h" +#include "control/box.h" constexpr auto MAX_VISIBILITY_DISTANCE = WALL_SIZE * 8; diff --git a/TR5Main/Game/pickup/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp index 83c6dc155..9a0821727 100644 --- a/TR5Main/Game/pickup/pickup.cpp +++ b/TR5Main/Game/pickup/pickup.cpp @@ -8,7 +8,7 @@ #else #include "inventory.h" #endif -#include "control/flipmap.h" +#include "room.h" #include "effects/debris.h" #include "health.h" #include "items.h" diff --git a/TR5Main/Game/puzzles_keys.cpp b/TR5Main/Game/puzzles_keys.cpp index 9a4a7619d..f4cb42efd 100644 --- a/TR5Main/Game/puzzles_keys.cpp +++ b/TR5Main/Game/puzzles_keys.cpp @@ -10,7 +10,7 @@ #endif #include "pickup.h" #include "animation.h" -#include "control.h" +#include "control/control.h" #include "puzzles_keys.h" #include "generic_switch.h" #include "camera.h" diff --git a/TR5Main/Game/room.cpp b/TR5Main/Game/room.cpp index a94e44eb3..2c7a57280 100644 --- a/TR5Main/Game/room.cpp +++ b/TR5Main/Game/room.cpp @@ -1,5 +1,152 @@ #include "framework.h" #include "room.h" +#include "control/control.h" +#include "control/lot.h" +#include "control/volume.h" +#include "Renderer11.h" + +using namespace TEN::Renderer; + +byte FlipStatus = 0; +int FlipStats[MAX_FLIPMAP]; +int FlipMap[MAX_FLIPMAP]; + +short IsRoomOutsideNo; +std::vector OutsideRoomTable[OUTSIDE_SIZE][OUTSIDE_SIZE]; + +void DoFlipMap(short group) +{ + ROOM_INFO temp; + + for (size_t i = 0; i < g_Level.Rooms.size(); i++) + { + ROOM_INFO* r = &g_Level.Rooms[i]; + + if (r->flippedRoom >= 0 && r->flipNumber == group) + { + RemoveRoomFlipItems(r); + + ROOM_INFO* flipped = &g_Level.Rooms[r->flippedRoom]; + + temp = *r; + *r = *flipped; + *flipped = temp; + + r->flippedRoom = flipped->flippedRoom; + flipped->flippedRoom = -1; + + r->itemNumber = flipped->itemNumber; + r->fxNumber = flipped->fxNumber; + + AddRoomFlipItems(r); + + g_Renderer.flipRooms(static_cast(i), r->flippedRoom); + + for (auto& fd : r->floor) + fd.Room = i; + for (auto& fd : flipped->floor) + fd.Room = r->flippedRoom; + } + } + + int status = FlipStats[group] == 0; + FlipStats[group] = status; + FlipStatus = status; + + for (int i = 0; i < ActiveCreatures.size(); i++) + { + ActiveCreatures[i]->LOT.targetBox = NO_BOX; + } +} + +void AddRoomFlipItems(ROOM_INFO* r) +{ + for (short linkNum = r->itemNumber; linkNum != NO_ITEM; linkNum = g_Level.Items[linkNum].nextItem) + { + ITEM_INFO* item = &g_Level.Items[linkNum]; + + //if (item->objectNumber == ID_RAISING_BLOCK1 && item->itemFlags[1]) + // AlterFloorHeight(item, -1024); + + if (item->objectNumber == ID_RAISING_BLOCK2) + { + //if (item->itemFlags[1]) + // AlterFloorHeight(item, -2048); + } + } +} + +void RemoveRoomFlipItems(ROOM_INFO* r) +{ + for (short linkNum = r->itemNumber; linkNum != NO_ITEM; linkNum = g_Level.Items[linkNum].nextItem) + { + ITEM_INFO* item = &g_Level.Items[linkNum]; + + if (item->flags & 0x100 && Objects[item->objectNumber].intelligent && item->hitPoints <= 0 && item->hitPoints != NOT_TARGETABLE) + { + KillItem(linkNum); + } + } +} +int IsObjectInRoom(short roomNumber, short objectNumber) +{ + short itemNumber = g_Level.Rooms[roomNumber].itemNumber; + + if (itemNumber == NO_ITEM) + return 0; + + while (true) + { + ITEM_INFO* item = &g_Level.Items[itemNumber]; + + if (item->objectNumber == objectNumber) + break; + + itemNumber = item->nextItem; + + if (itemNumber == NO_ITEM) + return 0; + } + + return 1; +} + +int IsRoomOutside(int x, int y, int z) +{ + if (x < 0 || z < 0) + return -2; + + int xTable = x / 1024; + int zTable = z / 1024; + + if (OutsideRoomTable[xTable][zTable].size() == 0) + return -2; + + for (size_t i = 0; i < OutsideRoomTable[xTable][zTable].size(); i++) + { + short roomNumber = OutsideRoomTable[xTable][zTable][i]; + ROOM_INFO* r = &g_Level.Rooms[roomNumber]; + + if ((y > r->maxceiling) && (y < r->minfloor) + && ((z > (r->z + 1024)) && (z < (r->z + ((r->xSize - 1) * 1024)))) + && ((x > (r->x + 1024)) && (x < (r->x + ((r->ySize - 1) * 1024))))) + { + IsRoomOutsideNo = roomNumber; + + FLOOR_INFO* floor = GetFloor(x, y, z, &roomNumber); + int height = GetFloorHeight(floor, x, y, z); + if (height == NO_HEIGHT || y > height) + return -2; + height = GetCeiling(floor, x, y, z); + if (y < height) + return -2; + + return ((r->flags & (ENV_FLAG_WIND | ENV_FLAG_WATER)) != 0 ? 1 : -3); + } + } + + return -2; +} FLOOR_INFO* GetSector(ROOM_INFO* r, int x, int z) { diff --git a/TR5Main/Game/room.h b/TR5Main/Game/room.h index dda3fed08..9f668cf3f 100644 --- a/TR5Main/Game/room.h +++ b/TR5Main/Game/room.h @@ -4,7 +4,9 @@ #include "floordata.h" #include "Specific\phd_global.h" -struct ANIM_FRAME; +struct TRIGGER_VOLUME; + +constexpr auto MAX_FLIPMAP = 255; struct ROOM_VERTEX { @@ -87,51 +89,6 @@ enum StaticMeshFlags : short SM_SOLID = 2 }; -enum TriggerStatus -{ - TS_OUTSIDE = 0, - TS_ENTERING = 1, - TS_INSIDE = 2, - TS_LEAVING = 3 -}; - -enum TriggerVolumeType -{ - VOLUME_BOX = 0, - VOLUME_SPHERE = 1, - VOLUME_PRISM = 2 // Unsupported as of now -}; - -enum TriggerVolumeActivators -{ - PLAYER = 1, - NPC = 2, - MOVEABLES = 4, - STATICS = 8, - FLYBYS = 16, - PHYSICALOBJECTS = 32 // Future-proofness for Bullet -}; - -struct TRIGGER_VOLUME -{ - TriggerVolumeType type; - - Vector3 position; - Quaternion rotation; - Vector3 scale; // X used as radius if type is VOLUME_SPHERE - - std::string onEnter; - std::string onInside; - std::string onLeave; - - int activators; - bool oneShot; - - TriggerStatus status; - BoundingOrientedBox box; - BoundingSphere sphere; -}; - struct ROOM_INFO { int x; @@ -164,5 +121,17 @@ struct ROOM_INFO constexpr auto NUM_ROOMS = 1024; constexpr auto NO_ROOM = -1; +constexpr auto OUTSIDE_Z = 64; +constexpr auto OUTSIDE_SIZE = 108; + +extern byte FlipStatus; +extern int FlipStats[MAX_FLIPMAP]; +extern int FlipMap[MAX_FLIPMAP]; + +void DoFlipMap(short group); +void AddRoomFlipItems(ROOM_INFO* r); +void RemoveRoomFlipItems(ROOM_INFO* r); +int IsObjectInRoom(short roomNumber, short objectNumber); +int IsRoomOutside(int x, int y, int z); FLOOR_INFO* GetSector(ROOM_INFO* r, int x, int z); \ No newline at end of file diff --git a/TR5Main/Game/rope.cpp b/TR5Main/Game/rope.cpp index 6b2e8d734..39f167d79 100644 --- a/TR5Main/Game/rope.cpp +++ b/TR5Main/Game/rope.cpp @@ -4,7 +4,7 @@ #include "lara.h" #include "level.h" #include "input.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "camera.h" diff --git a/TR5Main/Game/savegame.cpp b/TR5Main/Game/savegame.cpp index 08277002e..0ea3697ce 100644 --- a/TR5Main/Game/savegame.cpp +++ b/TR5Main/Game/savegame.cpp @@ -2,11 +2,11 @@ #include "savegame.h" #include "Lara.h" #include "items.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "spotcam.h" #include "traps.h" -#include "control/flipmap.h" +#include "room.h" #include "sound/sound.h" #include "level.h" #include "setup.h" diff --git a/TR5Main/Game/spotcam.cpp b/TR5Main/Game/spotcam.cpp index 3834b7b50..c9d7a501c 100644 --- a/TR5Main/Game/spotcam.cpp +++ b/TR5Main/Game/spotcam.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "spotcam.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "effects\tomb4fx.h" #include "lara.h" diff --git a/TR5Main/Game/switch.cpp b/TR5Main/Game/switch.cpp index 75e2d4f07..251eac8cf 100644 --- a/TR5Main/Game/switch.cpp +++ b/TR5Main/Game/switch.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "switch.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "objects.h" #include "Lara.h" #ifdef NEW_INV diff --git a/TR5Main/Game/traps.cpp b/TR5Main/Game/traps.cpp index 1cfe83f7e..5ea061ea3 100644 --- a/TR5Main/Game/traps.cpp +++ b/TR5Main/Game/traps.cpp @@ -12,8 +12,8 @@ #include "animation.h" #include "level.h" #include "input.h" +#include "room.h" #include "Sound/sound.h" -#include "control/flipmap.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Objects/Effects/tr4_bubbles.cpp b/TR5Main/Objects/Effects/tr4_bubbles.cpp index be92b0a62..b4e6ff058 100644 --- a/TR5Main/Objects/Effects/tr4_bubbles.cpp +++ b/TR5Main/Objects/Effects/tr4_bubbles.cpp @@ -8,7 +8,7 @@ #include "effects\effects.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "tr4_mutant.h" #include "collide.h" diff --git a/TR5Main/Objects/Effects/tr5_electricity.cpp b/TR5Main/Objects/Effects/tr5_electricity.cpp index 16d8075f4..bb01ad0dc 100644 --- a/TR5Main/Objects/Effects/tr5_electricity.cpp +++ b/TR5Main/Objects/Effects/tr5_electricity.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_electricity.h" #include "effects\effects.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "setup.h" #include "animation.h" diff --git a/TR5Main/Objects/Generic/Doors/double_doors.cpp b/TR5Main/Objects/Generic/Doors/double_doors.cpp index 26f8e4835..89ef1cd9b 100644 --- a/TR5Main/Objects/Generic/Doors/double_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/double_doors.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Doors/generic_doors.cpp b/TR5Main/Objects/Generic/Doors/generic_doors.cpp index ebb54b269..bbf7ae831 100644 --- a/TR5Main/Objects/Generic/Doors/generic_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/generic_doors.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp index c6d078b0d..bc9085821 100644 --- a/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp +++ b/TR5Main/Objects/Generic/Doors/pushpull_kick_door.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Doors/sequence_door.cpp b/TR5Main/Objects/Generic/Doors/sequence_door.cpp index b83ce1c63..3fac743ef 100644 --- a/TR5Main/Objects/Generic/Doors/sequence_door.cpp +++ b/TR5Main/Objects/Generic/Doors/sequence_door.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Doors/steel_door.cpp b/TR5Main/Objects/Generic/Doors/steel_door.cpp index 98eb8027e..0dfe44608 100644 --- a/TR5Main/Objects/Generic/Doors/steel_door.cpp +++ b/TR5Main/Objects/Generic/Doors/steel_door.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Doors/underwater_door.cpp b/TR5Main/Objects/Generic/Doors/underwater_door.cpp index d44a1e92a..50b57d382 100644 --- a/TR5Main/Objects/Generic/Doors/underwater_door.cpp +++ b/TR5Main/Objects/Generic/Doors/underwater_door.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "generic_doors.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "newinv2.h" #include "input.h" #include "pickup.h" diff --git a/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp b/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp index a9428c977..68e5393b4 100644 --- a/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp +++ b/TR5Main/Objects/Generic/Object/generic_trapdoor.cpp @@ -3,7 +3,7 @@ #include "lara.h" #include "input.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "animation.h" diff --git a/TR5Main/Objects/Generic/Object/generic_trapdoor.h b/TR5Main/Objects/Generic/Object/generic_trapdoor.h index 4ca8650a6..5ca39bf60 100644 --- a/TR5Main/Objects/Generic/Object/generic_trapdoor.h +++ b/TR5Main/Objects/Generic/Object/generic_trapdoor.h @@ -1,7 +1,7 @@ #pragma once #include "items.h" #include "collide.h" -#include "control.h" +#include "control/control.h" void InitialiseTrapDoor(short itemNumber); void TrapDoorCollision(short itemNumber, ITEM_INFO* l, COLL_INFO* coll); diff --git a/TR5Main/Objects/Generic/Switches/cog_switch.cpp b/TR5Main/Objects/Generic/Switches/cog_switch.cpp index f4c0e3098..1609748da 100644 --- a/TR5Main/Objects/Generic/Switches/cog_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/cog_switch.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "cog_switch.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "lara.h" #include "generic_switch.h" #include "itemdata/door_data.h" -#include "box.h" +#include "control/box.h" #include "generic_doors.h" #include "collide.h" #include "animation.h" diff --git a/TR5Main/Objects/Generic/Switches/generic_switch.cpp b/TR5Main/Objects/Generic/Switches/generic_switch.cpp index 2182ad1b9..9a421cd2c 100644 --- a/TR5Main/Objects/Generic/Switches/generic_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/generic_switch.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "level.h" #include "lara.h" diff --git a/TR5Main/Objects/Generic/Switches/jump_switch.cpp b/TR5Main/Objects/Generic/Switches/jump_switch.cpp index eb0e6302a..2a0e92659 100644 --- a/TR5Main/Objects/Generic/Switches/jump_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/jump_switch.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "jump_switch.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "lara.h" #include "generic_switch.h" diff --git a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp index 4b29e173e..49fd2d6bf 100644 --- a/TR5Main/Objects/Generic/Switches/pulley_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/pulley_switch.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "pulley_switch.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "lara.h" #include "generic_switch.h" diff --git a/TR5Main/Objects/Generic/Switches/turn_switch.cpp b/TR5Main/Objects/Generic/Switches/turn_switch.cpp index 362553f87..35a157151 100644 --- a/TR5Main/Objects/Generic/Switches/turn_switch.cpp +++ b/TR5Main/Objects/Generic/Switches/turn_switch.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "turn_switch.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "lara.h" #include "sound.h" diff --git a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp index ef941f710..9c4ff9e05 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_ape.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_ape.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr1_ape.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.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 0f023bc79..1d9a0d826 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bear.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_bear.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr1_bear.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 d4bdf6e6f..baa2b605d 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr1_bigrat.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "level.h" #include "misc.h" #include "people.h" #include "setup.h" -#include "control.h" +#include "control/control.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_centaur.cpp b/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp index ddc41ad17..e2818a37e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_centaur.cpp @@ -1,18 +1,16 @@ #include "framework.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "level.h" #include "lara.h" #include "people.h" -#include "Sound\sound.h" -#include "effects\tomb4fx.h" +#include "Sound/sound.h" +#include "effects/tomb4fx.h" #include "tr1_centaur.h" -#include "sphere.h" #include "lara_one_gun.h" -#include "effects\effects.h" +#include "effects/effects.h" #include "animation.h" #include "collide.h" -#include "item.h" #include "setup.h" enum centaur_anims { diff --git a/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp b/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp index 6e9f3e95f..d3dcdd611 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp @@ -5,7 +5,7 @@ #include "misc.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "animation.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 c481b8532..467dd8254 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_giant_mutant.cpp @@ -1,5 +1,5 @@ #include "framework.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "items.h" #include "camera.h" diff --git a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp index 9322afbef..bbd45bb1e 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr1_natla.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "items.h" #include "missile.h" diff --git a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp index 60c062aba..5f29f8c48 100644 --- a/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp +++ b/TR5Main/Objects/TR1/Entity/tr1_wolf.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr1_wolf.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" BITE_INFO wolfBite = { 0, -14, 174, 6 }; enum wolfStates { diff --git a/TR5Main/Objects/TR1/tr1_objects.cpp b/TR5Main/Objects/TR1/tr1_objects.cpp index 653ca6a23..de5707963 100644 --- a/TR5Main/Objects/TR1/tr1_objects.cpp +++ b/TR5Main/Objects/TR1/tr1_objects.cpp @@ -14,7 +14,7 @@ /// traps /// necessary import -#include "box.h" +#include "control/box.h" #include "collide.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp index 037371d27..483710b06 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_barracuda.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr2_barracuda.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "setup.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp b/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp index 756e3f855..dbac9502d 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr2_birdmonster.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.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 0dcf49bd6..3ec105630 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_dragon.cpp @@ -4,8 +4,8 @@ #include "effects/effects.h" #include "items.h" #include "collide.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "sphere.h" #include "camera.h" #include "level.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp index 4826f4966..258163e28 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_eagle_or_crow.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr2_eagle_or_crow.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "items.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp index 2c8985b84..4cd4bfd07 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_knifethrower.cpp @@ -2,7 +2,7 @@ #include "tr2_knifethrower.h" #include "items.h" #include "effects\effects.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp index 60143a671..11300e23b 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "tr2_mercenary.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp index 562fe24b9..5b2980351 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_monk.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_monk.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr2_monk.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "lara.h" #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp b/TR5Main/Objects/TR2/Entity/tr2_rat.cpp index df095af46..d942307ff 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_rat.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_rat.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr2_rat.h" #include "lara.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 38d2734db..e18d4cf46 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_shark.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_shark.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr2_shark.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "lara.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.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 1211dff03..93c5a5562 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_silencer.cpp @@ -1,10 +1,10 @@ #include "framework.h" #include "tr2_silencer.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "itemdata/creature_info.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 255f28b2c..d8902bb61 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_skidman.cpp @@ -3,8 +3,8 @@ #include "items.h" #include "collide.h" #include "lara.h" -#include "lot.h" -#include "box.h" +#include "control/lot.h" +#include "control/box.h" #include "people.h" #include "sphere.h" #include "setup.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp index aef384100..f1d5536ad 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spear_guardian.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "animation.h" #include "tr2_spear_guardian.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "items.h" #include "setup.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp b/TR5Main/Objects/TR2/Entity/tr2_spider.cpp index e7a2eba9e..a0cdaab18 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_spider.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_spider.cpp @@ -1,15 +1,15 @@ #include "framework.h" #include "tr2_spider.h" #include "effects/effects.h" -#include "box.h" +#include "control/box.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "lara.h" #include "setup.h" #include "effects/tomb4fx.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" #include "animation.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 996f30604..1fdcfcc94 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_sword_guardian.cpp @@ -1,8 +1,8 @@ #include "framework.h" #include "tr2_sword_guardian.h" #include "animation.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "effects/effects.h" #include "items.h" #include "effects/tomb4fx.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp index c9db958d1..f978613bb 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr2_worker_dualrevolver.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp index d4d978a0f..bff2a8522 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr2_worker_flamethrower.h" #include "animation.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "items.h" #include "missile.h" #include "effects/tomb4fx.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "effects/effects.h" #include "Specific/trmath.h" diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp index c3dc45d2b..ba16a6f8c 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_machinegun.cpp @@ -2,11 +2,11 @@ #include "tr2_worker_machinegun.h" #include "animation.h" #include "people.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "itemdata/creature_info.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 9577a93a6..bf1b0aba6 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_worker_shotgun.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr2_worker_shotgun.h" #include "animation.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "items.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "itemdata/creature_info.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 06fe6c281..74004778c 100644 --- a/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp +++ b/TR5Main/Objects/TR2/Entity/tr2_yeti.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr2_yeti.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "items.h" #include "lara.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 7353adaf1..38afab26f 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_killerstatue.cpp @@ -2,7 +2,7 @@ #include "tr2_killerstatue.h" #include "level.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "effects/effects.h" #include "animation.h" diff --git a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp index 163f6e7ee..f329c87c7 100644 --- a/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp +++ b/TR5Main/Objects/TR2/Trap/tr2_spinningblade.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr2_spinningblade.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "setup.h" #include "effects/effects.h" diff --git a/TR5Main/Objects/TR2/tr2_objects.cpp b/TR5Main/Objects/TR2/tr2_objects.cpp index 61a962e38..da854551f 100644 --- a/TR5Main/Objects/TR2/tr2_objects.cpp +++ b/TR5Main/Objects/TR2/tr2_objects.cpp @@ -31,7 +31,7 @@ #include "snowmobile.h" /// necessary import #include "collide.h" -#include "box.h" +#include "control/box.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp index 2c0458c17..17f8e3db2 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_civvy.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr3_civvy.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "people.h" #include "setup.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp index 387b9dd92..e3754a9e2 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_cobra.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr3_cobra.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "items.h" #include "lara.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp index 872b23232..c7c039f1b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp @@ -4,7 +4,7 @@ #include "level.h" #include "lara.h" #include "fish.h" -#include "control.h" +#include "control/control.h" #include "effects\effects.h" #define PIRAHNA_DAMAGE 4 diff --git a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp index fa5bb0650..499f77dbf 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr3_flamethrower.h" -#include "box.h" +#include "control/box.h" #include "sphere.h" #include "effects\effects.h" #include "people.h" #include "items.h" #include "animation.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp index 4af4821f3..26e8e0341 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_monkey.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr3_monkey.h" -#include "box.h" +#include "control/box.h" #include "lara.h" #include "effects\effects.h" #include "items.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 3ea7abfd4..b4e0efb67 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpgun.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr3_mpgun.h" -#include "box.h" +#include "control/box.h" #include "sphere.h" #include "effects/effects.h" #include "people.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "animation.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp index f33c56147..95517c8c0 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr3_mpstick.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "people.h" #include "items.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp b/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp index 07f0c9b24..ae3aa6b27 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_raptor.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr3_raptor.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 d8977d2aa..78c3dfc42 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_scuba.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr3_scuba.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "lara.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" #include "control\los.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index c6c0cf2f7..7840fb2ff 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp @@ -2,7 +2,7 @@ #include "tr3_shiva.h" #include "animation.h" #include "effects/effects.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp index 6d2135e68..005be9e25 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_sophia.cpp @@ -2,9 +2,9 @@ #include "tr3_sophia.h" #include "items.h" #include "effects\effects.h" -#include "lot.h" +#include "control/lot.h" #include "boss.h" -#include "box.h" +#include "control/box.h" #include "sphere.h" #include "people.h" #include "animation.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp index dcf9b53a7..7e35fe549 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tiger.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr3_tiger.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 96011853d..9d0bab663 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tony.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tony.cpp @@ -3,9 +3,9 @@ #include "effects\effects.h" #include "sphere.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "boss.h" -#include "box.h" +#include "control/box.h" #include "animation.h" #include "level.h" #include "setup.h" diff --git a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp index 0713c2bdc..5017b5102 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_trex.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_trex.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr3_trex.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "camera.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" void LaraTyrannosaurDeath(ITEM_INFO* item) { item->goalAnimState = 8; diff --git a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp index 77db6f3fa..a2bdbfd64 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_tribesman.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr3_tribesman.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "items.h" #include "sphere.h" diff --git a/TR5Main/Objects/TR3/Trap/train.cpp b/TR5Main/Objects/TR3/Trap/train.cpp index b025f09cb..73d4d8aab 100644 --- a/TR5Main/Objects/TR3/Trap/train.cpp +++ b/TR5Main/Objects/TR3/Trap/train.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "items.h" #include "floordata.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "effects/effects.h" #include "Sound/sound.h" diff --git a/TR5Main/Objects/TR3/Vehicles/kayak.cpp b/TR5Main/Objects/TR3/Vehicles/kayak.cpp index 463c19a54..246553f2c 100644 --- a/TR5Main/Objects/TR3/Vehicles/kayak.cpp +++ b/TR5Main/Objects/TR3/Vehicles/kayak.cpp @@ -10,7 +10,7 @@ #include "level.h" #include "setup.h" #include "input.h" -#include "control.h" +#include "control/control.h" #include "kayak_info.h" using std::vector; diff --git a/TR5Main/Objects/TR3/Vehicles/upv.cpp b/TR5Main/Objects/TR3/Vehicles/upv.cpp index d016c5b23..ca27df35d 100644 --- a/TR5Main/Objects/TR3/Vehicles/upv.cpp +++ b/TR5Main/Objects/TR3/Vehicles/upv.cpp @@ -5,7 +5,7 @@ #include "sphere.h" #include "effects\effects.h" #include "collide.h" -#include "box.h" +#include "control/box.h" #include "lara_flare.h" #include "animation.h" #include "effects\tomb4fx.h" diff --git a/TR5Main/Objects/TR3/tr3_objects.cpp b/TR5Main/Objects/TR3/tr3_objects.cpp index 45de2bead..4db33de9b 100644 --- a/TR5Main/Objects/TR3/tr3_objects.cpp +++ b/TR5Main/Objects/TR3/tr3_objects.cpp @@ -34,7 +34,7 @@ #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "box.h" +#include "control/box.h" static void StartBaddy(OBJECT_INFO* obj) { obj = &Objects[ID_TONY_BOSS]; diff --git a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp index efff448bb..dc780ea44 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_ahmet.cpp @@ -1,18 +1,18 @@ #include "framework.h" #include "tr4_ahmet.h" -#include "control.h" +#include "control/control.h" #include "sphere.h" #include "effects\effects.h" #include "effects\weather.h" #include "Sound\sound.h" #include "setup.h" -#include "box.h" +#include "control/box.h" #include "level.h" #include "misc.h" #include "lara.h" #include "people.h" #include "items.h" -#include "lot.h" +#include "control/lot.h" #include "itemdata/creature_info.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 33df479d5..4690f9296 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp @@ -1,9 +1,9 @@ #include "framework.h" #include "tr4_baboon.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "misc.h" #include "Lara.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp index 0d32674e5..0ee992328 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_baddy.cpp @@ -1,18 +1,16 @@ #include "framework.h" #include "tr4_baddy.h" #include "items.h" -#include "box.h" -#include "sphere.h" -#include "effects\effects.h" +#include "control/box.h" +#include "effects/effects.h" #include "lara.h" #include "people.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" -#include +#include "control/lot.h" #include "itemdata/creature_info.h" -#include "control.h" /* ID_BADDY_1 diff --git a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp index c40cc3f95..bdb2c22b9 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr4_bat.h" -#include "box.h" -#include "control.h" +#include "control/box.h" +#include "control/control.h" #include "effects\effects.h" #include "misc.h" #include "lara.h" -#include "lot.h" +#include "control/lot.h" #include "setup.h" #include "Specific\trmath.h" #include "itemdata/creature_info.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp index 3e21df3a8..518f19fe4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp @@ -4,7 +4,7 @@ #include "effects\effects.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific\trmath.h" #include #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp index 9d3946616..7544705e7 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr4_bigscorpion.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "items.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" int CutSeqNum; diff --git a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp index b0c26e0e5..1651a7162 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_crocodile.cpp @@ -1,18 +1,18 @@ #include "framework.h" #include "tr4_crocodile.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "people.h" #include "items.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "animation.h" #include "misc.h" #include "itemdata/creature_info.h" #include "collide.h" -#include "control.h" +#include "control/control.h" enum CROCODILE_STATE { diff --git a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp index b908a4bab..040d13386 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_demigod.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_demigod.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "sphere.h" #include "effects\effects.h" @@ -11,7 +11,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "itemdata/creature_info.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 bcd88765f..cf0fca54f 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_dog.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_dog.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr4_dog.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 ec953d916..29ad75e88 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp @@ -2,12 +2,12 @@ #include "tr4_enemy_jeep.h" #include "items.h" #include "level.h" -#include "box.h" +#include "control/box.h" #include "Specific/trmath.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "sphere.h" -#include "lot.h" +#include "control/lot.h" #include "Sound/sound.h" #include "animation.h" #include "itemdata/creature_info.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp index 2ec5a4a7b..e7c5e2ae0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_guide.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_guide.cpp @@ -1,8 +1,8 @@ #include "framework.h" #include "tr4_guide.h" #include "items.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "effects/effects.h" #include "effects/tomb4fx.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp index 441e3cc4a..90cbdfe78 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_hammerhead.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "people.h" #include "items.h" @@ -10,7 +10,7 @@ #include "animation.h" #include "misc.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 ee1567c66..88ba212e4 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_harpy.cpp @@ -1,17 +1,17 @@ #include "framework.h" #include "tr4_harpy.h" #include "people.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "items.h" #include "sphere.h" #include "animation.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 f2bda157a..9b63f1223 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp @@ -4,12 +4,12 @@ #include "effects/effects.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific/trmath.h" #include "lara.h" #include "Sound/sound.h" #include "sphere.h" -#include "box.h" +#include "control/box.h" #include "animation.h" namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp b/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp index 4da8a1a4d..179e51a1b 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_jeanyves.cpp @@ -3,7 +3,7 @@ #include "setup.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void InitialiseJeanYves(short itemNumber) diff --git a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp index 81d01ded5..2ff8930a0 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_knighttemplar.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_knighttemplar.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "effects/debris.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp index 89c2c5480..d82df5d44 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_littlebeetle.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific\trmath.h" #include "lara.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp index b7829a405..ff60fa243 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_mummy.cpp @@ -2,14 +2,14 @@ #include "tr4_mummy.h" #include "items.h" #include "lara.h" -#include "box.h" +#include "control/box.h" #include "lara.h" #include "effects\effects.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 65f646b2d..dd03eb12d 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp @@ -9,7 +9,7 @@ #include "objectslist.h" #include "Specific/trmath.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" #include "animation.h" namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp index 5cf16169e..caf3e5435 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sas.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sas.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr4_sas.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "people.h" #include "lara.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "effects/effects.h" #include "effects/tomb4fx.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp index 659e0a9f8..c4807f4aa 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr4_sentrygun.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "items.h" #ifdef NEW_INV @@ -9,7 +9,7 @@ #include "inventory.h" #endif #include "level.h" -#include "lot.h" +#include "control/lot.h" #include "effects/tomb4fx.h" #include "people.h" #include "Sound/sound.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp index 11f7b3fa9..9d4e6da18 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp @@ -4,7 +4,7 @@ #include "effects/effects.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Specific/trmath.h" #include "lara.h" #include "people.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp index 8cc90d13d..94e87e6d5 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_skeleton.cpp @@ -1,11 +1,11 @@ #include "framework.h" #include "tr4_skeleton.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "effects/effects.h" #include "effects/debris.h" -#include "lot.h" +#include "control/lot.h" #include "lara.h" #include "Sound/sound.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp index 8738dac2a..0b9c24bec 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr4_smallscorpion.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "effects\effects.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 f99fa0c61..1c44d0831 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_sphinx.cpp @@ -2,7 +2,7 @@ #include "tr4_sphinx.h" #include "effects\debris.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp index b8090d642..ca1ad7de3 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_troops.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_troops.cpp @@ -1,16 +1,16 @@ #include "framework.h" #include "tr4_troops.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "sphere.h" #include "effects\effects.h" #include "lara.h" #include "people.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" #include "animation.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 091f25d33..5756fd163 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_von_croy.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "items.h" -#include "box.h" -#include "lot.h" +#include "control/box.h" +#include "control/lot.h" #include "effects/effects.h" #include "effects/tomb4fx.h" #include "setup.h" diff --git a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp index 437f86dbe..5597591e9 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr4_wildboar.h" -#include "box.h" +#include "control/box.h" #include "items.h" #include "effects\effects.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 6cba4f1f5..8cf2bec7b 100644 --- a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp +++ b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp @@ -2,7 +2,7 @@ #include "tr4_wraith.h" #include "level.h" #include "effects/effects.h" -#include "control/flipmap.h" +#include "room.h" #include "flipeffect.h" #include "objectslist.h" #include "Specific/trmath.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp index a915af2d7..a3f0a55f0 100644 --- a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_element_puzzle.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "animation.h" #include diff --git a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp index 929921df5..f1fc2dee6 100644 --- a/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_laradouble.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "level.h" #include "Sound/sound.h" -#include "box.h" +#include "control/box.h" #include "lara.h" #include "animation.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp index 447676a7c..87f74a71d 100644 --- a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_mapper.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "animation.h" #include diff --git a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp index 19c5970c1..3539f8389 100644 --- a/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_obelisk.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "level.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "Sound/sound.h" #include "lara.h" #include "effects/effects.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_scales.cpp b/TR5Main/Objects/TR4/Object/tr4_scales.cpp index 669f39d65..d66bf8a61 100644 --- a/TR5Main/Objects/TR4/Object/tr4_scales.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_scales.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_scales.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "setup.h" #include "items.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Object/tr4_senet.cpp b/TR5Main/Objects/TR4/Object/tr4_senet.cpp index c15ab5fa7..577fd61a8 100644 --- a/TR5Main/Objects/TR4/Object/tr4_senet.cpp +++ b/TR5Main/Objects/TR4/Object/tr4_senet.cpp @@ -2,7 +2,7 @@ #include "tr4_senet.h" #include "Sound\sound.h" #include "items.h" -#include "control.h" +#include "control/control.h" #include "setup.h" #include "effects\tomb4fx.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp index a354ac19c..0e1737fb1 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_birdblade.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_birdblade.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void BirdBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp index e770e8036..5e237d1db 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_blade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_blade.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "collide.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "effects\effects.h" void BladeCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll) diff --git a/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp index fa9426346..8b1eb157a 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_catwalkblade.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_catwalkblade.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void CatwalkBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_chain.cpp b/TR5Main/Objects/TR4/Trap/tr4_chain.cpp index 294a4d60f..db159075d 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_chain.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_chain.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_chain.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp index 14c5a03b4..423b0bacd 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_cog.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_cog.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_cog.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound/sound.h" #include "collide.h" #include "effects/effects.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp b/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp index a466a4464..5dfcafb0d 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_fourblades.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_fourblades.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp b/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp index de7686551..e7359d970 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_element_puzzle.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "animation.h" #include diff --git a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp index da3cd784e..8b2483a6f 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_joby_spikes.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "Sound/sound.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp index 8687e30c0..9048fce9f 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_moving_blade.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "animation.h" #include diff --git a/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp index c7a903549..88e5e08a3 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_plinthblade.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_plinthblade.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void PlinthBladeControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_plough.cpp b/TR5Main/Objects/TR4/Trap/tr4_plough.cpp index c23ea6a5e..69e3106fc 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_plough.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_plough.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_plough.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void PloughControl(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp b/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp index 3c3114932..3b37f88f2 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_sethblade.cpp @@ -2,7 +2,7 @@ #include "tr4_sethblade.h" #include "level.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void InitialiseSethBlade(short itemNum) diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp index fa24cd6ec..71610d256 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikeball.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_spikeball.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "animation.h" namespace TEN::Entities::TR4 diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp index d97fafd3a..511eea568 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikyceiling.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_spikyceiling.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound/sound.h" #include "items.h" #include "lara.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp index eb75deb5a..b5087a5ba 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_spikywall.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_spikywall.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "lara.h" #include "items.h" diff --git a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp index c95e8985b..2a0b42dc5 100644 --- a/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp +++ b/TR5Main/Objects/TR4/Trap/tr4_stargate.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr4_stargate.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound/sound.h" #include "collide.h" #include "sphere.h" diff --git a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp index a51eec7c7..6c5a854d9 100644 --- a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp +++ b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "motorbike.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "effects/effects.h" #include "lara.h" #ifdef NEW_INV diff --git a/TR5Main/Objects/TR4/tr4_objects.cpp b/TR5Main/Objects/TR4/tr4_objects.cpp index 7fbbdd802..5ce593b2f 100644 --- a/TR5Main/Objects/TR4/tr4_objects.cpp +++ b/TR5Main/Objects/TR4/tr4_objects.cpp @@ -72,7 +72,7 @@ #include "level.h" #include "tr4_enemy_jeep.h" #include "itemdata/creature_info.h" -#include "box.h" +#include "control/box.h" using namespace TEN::Entities::TR4; diff --git a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp index c88684be8..05140c50e 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_bats_emitter.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_bats_emitter.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "setup.h" #include "effects\effects.h" #include "effects\tomb4fx.h" diff --git a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp index 7662c7b36..2b1a5f58e 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_rats_emitter.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_rats_emitter.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "flipeffect.h" #include "setup.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp index 9f92d60b1..1cd630893 100644 --- a/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp +++ b/TR5Main/Objects/TR5/Emitter/tr5_spider_emitter.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_spider_emitter.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "flipeffect.h" #include "setup.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp index c11ace2bf..ed8f72d77 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_brownbeast.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_brownbeast.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "effects\tomb4fx.h" #include "setup.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp index fcead406c..04e4ea7aa 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_chef.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_chef.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_chef.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "sphere.h" #include "effects\debris.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp index 3d22488fd..1957a59c8 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_cyborg.cpp @@ -2,7 +2,7 @@ #include "tr5_cyborg.h" #include "items.h" #include "sphere.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "people.h" #include "animation.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp b/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp index a01174cb4..a594f49e1 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_doberman.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr5_doberman.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 746bac306..b670a81eb 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_dog.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_dog.cpp @@ -1,13 +1,13 @@ #include "framework.h" #include "tr5_dog.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" -#include "control.h" +#include "control/control.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 c67d7ae87..e1368a10d 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_ghost.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_ghost.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp index 61d8cdc7e..3ce4a1291 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_gladiator.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_gladiator.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects/debris.h" #include "effects/effects.h" #include "effects/tomb4fx.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp index c64054edd..54fe16dd4 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_guard.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_guard.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_guard.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "effects/effects.h" #include "effects/tomb4fx.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp index a0ebd2544..5e1b7d0bd 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_hydra.cpp @@ -2,7 +2,7 @@ #include "tr5_hydra.h" #include "items.h" #include "sphere.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "setup.h" #include "people.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp index 28e2b36cb..24b1a3de8 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_imp.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_imp.cpp @@ -6,11 +6,11 @@ #include "animation.h" #include "effects\effects.h" #include "effects\flmtorch.h" -#include "box.h" +#include "control/box.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 0adb8b268..7531f26af 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lagoon_witch.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_lagoon_witch.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects\effects.h" #include "effects\tomb4fx.h" #ifdef NEW_INV diff --git a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp b/TR5Main/Objects/TR5/Entity/tr5_larson.cpp index efecf8a1a..58ad04611 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_larson.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_larson.cpp @@ -1,14 +1,14 @@ #include "framework.h" #include "tr5_larson.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "effects/effects.h" #include "people.h" #include "lara.h" #include "setup.h" #include "level.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #define STATE_TR5_LARSON_STOP 1 diff --git a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp index a99bef8b1..2239b249a 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_laser_head.cpp @@ -4,7 +4,7 @@ #include "items.h" #include "effects\tomb4fx.h" #include "effects\effects.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "effects\debris.h" #include "animation.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp index 64046ec6e..2d0498a0c 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_lion.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_lion.cpp @@ -3,14 +3,14 @@ #include "items.h" #include "effects\effects.h" -#include "lot.h" -#include "box.h" +#include "control/lot.h" +#include "control/box.h" #include "effects\tomb4fx.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.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 dd663d4f1..619c66bd7 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_reaper.cpp @@ -1,12 +1,12 @@ #include "framework.h" #include "tr5_reaper.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "setup.h" #include "level.h" #include "lara.h" #include "itemdata/creature_info.h" -#include "control.h" +#include "control/control.h" void InitialiseReaper(short itemNum) { ITEM_INFO* item; diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp index 1f3b1db62..11116d7a9 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.cpp @@ -4,11 +4,11 @@ #include "items.h" #include "effects\tomb4fx.h" #include "effects\effects.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "effects\debris.h" #include "animation.h" -#include "control.h" +#include "control/control.h" #include "setup.h" #include "level.h" #include "lara.h" diff --git a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp index c500526fb..82e96ec7e 100644 --- a/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp +++ b/TR5Main/Objects/TR5/Entity/tr5_submarine.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_submarine.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "sphere.h" #include "effects\tomb4fx.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp index 9d4e84674..fd5dba36c 100644 --- a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp @@ -4,7 +4,7 @@ #include "Specific\trmath.h" #include "Sound\sound.h" #include "tr5_missile.h" -#include "control.h" +#include "control/control.h" #include "items.h" void ControlBodyPart(short fxNumber) { diff --git a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp index ec9d6dd0c..7ea0205c4 100644 --- a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp @@ -2,8 +2,8 @@ #include "tr5_ExpandingPlatform.h" #include "items.h" #include "level.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "animation.h" #include "Sound/sound.h" #include "camera.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp index b5b751a2e..bba3aeaff 100644 --- a/TR5Main/Objects/TR5/Object/tr5_genslot.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_genslot.cpp @@ -2,7 +2,7 @@ #include "tr5_genslot.h" #include "items.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "effects\effects.h" #include "sphere.h" #include "animation.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp index 3243feb45..273a11efd 100644 --- a/TR5Main/Objects/TR5/Object/tr5_highobject.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_highobject.cpp @@ -2,7 +2,7 @@ #include "tr5_highobject.h" #include "items.h" #include "level.h" -#include "control/flipmap.h" +#include "room.h" #include "Sound/sound.h" #include "objectslist.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_missile.cpp b/TR5Main/Objects/TR5/Object/tr5_missile.cpp index b0ff2837e..e36b59300 100644 --- a/TR5Main/Objects/TR5/Object/tr5_missile.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_missile.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_missile.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "people.h" #include "sphere.h" #include "effects\tomb4fx.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp index 51d15f804..62a769616 100644 --- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp @@ -5,7 +5,7 @@ #include "items.h" #include "collide.h" #include "flipeffect.h" -#include "box.h" +#include "control/box.h" #include "level.h" #include "input.h" #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp index 552d4f75b..4c7845a8f 100644 --- a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp @@ -3,8 +3,8 @@ #include "items.h" #include "level.h" #include "animation.h" -#include "control.h" -#include "box.h" +#include "control/control.h" +#include "control/box.h" #include "objectslist.h" #include "Sound/sound.h" #include "camera.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp index 0b3aa21eb..5900e7143 100644 --- a/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_rollingball.cpp @@ -2,7 +2,7 @@ #include "tr5_rollingball.h" #include "sphere.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "setup.h" #include "Sound/sound.h" diff --git a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp index 7d3f9c758..3a4efb8dd 100644 --- a/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_teleporter.cpp @@ -2,12 +2,12 @@ #include "tr5_teleporter.h" #include "items.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "effects\weather.h" #include "lara.h" #include "camera.h" -#include "box.h" +#include "control/box.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 f8d955333..cea9701cf 100644 --- a/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_twoblockplatform.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_twoblockplatform.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "items.h" #include "lara.h" #include "Sound\sound.h" diff --git a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp index c61fa7e10..a66026732 100644 --- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp +++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_smashobject.h" #include "level.h" -#include "box.h" +#include "control/box.h" #include "Sound\sound.h" #include "effects\tomb4fx.h" #include "items.h" diff --git a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp index 70792cc53..165dc9c70 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_crowdove_switch.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr5_crowdove_switch.h" -#include "control.h" +#include "control/control.h" #include "input.h" #include "level.h" #include "lara.h" diff --git a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp index b0ce33d38..e7b0045c9 100644 --- a/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp +++ b/TR5Main/Objects/TR5/Switch/tr5_raisingcog.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_raisingcog.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "items.h" #include "Sound/sound.h" #include "spotcam.h" diff --git a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp index 621ec5416..18f63f11c 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp @@ -5,7 +5,7 @@ #include "lara.h" #include "setup.h" #include "Sound/sound.h" -#include "box.h" +#include "control/box.h" #include "animation.h" OBJECT_COLLISION_BOUNDS DeathSlideBounds = { -256, 256, -100, 100, 256, 512, 0, 0, -ANGLE(25.0f), ANGLE(25.0f), 0, 0 }; diff --git a/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp b/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp index 37374f6c9..d0d6adf5d 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_explosion.cpp @@ -1,7 +1,7 @@ #include "framework.h" #include "tr5_explosion.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "Sound/sound.h" #include "effects/effects.h" #include "effects/tomb4fx.h" @@ -13,7 +13,7 @@ #include "effects/debris.h" #include "generic_switch.h" #include "collide.h" -#include "box.h" +#include "control/box.h" using namespace TEN::Entities::Switches; diff --git a/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp b/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp index d2c8ca7ce..292b32637 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp @@ -3,7 +3,7 @@ #include "items.h" #include "level.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "animation.h" void FallingCeilingControl(short itemNumber) diff --git a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp index 6085a7648..a7781f885 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp @@ -1,6 +1,6 @@ #include "framework.h" #include "tr5_teethspike.h" -#include "control.h" +#include "control/control.h" #include "animation.h" #include "lara.h" #include "level.h" diff --git a/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp b/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp index 3a83bbd30..008c97d19 100644 --- a/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp +++ b/TR5Main/Objects/TR5/Trap/tr5_ventilator.cpp @@ -2,7 +2,7 @@ #include "tr5_ventilator.h" #include "animation.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "camera.h" #include "effects\effects.h" diff --git a/TR5Main/Objects/TR5/tr5_objects.cpp b/TR5Main/Objects/TR5/tr5_objects.cpp index 392b7d6bf..1b6341c2a 100644 --- a/TR5Main/Objects/TR5/tr5_objects.cpp +++ b/TR5Main/Objects/TR5/tr5_objects.cpp @@ -68,7 +68,7 @@ /// register objects #include "object_helper.h" #include "itemdata/creature_info.h" -#include "box.h" +#include "control/box.h" using namespace TEN::Entities::TR5; static void StartBaddy(OBJECT_INFO *obj) diff --git a/TR5Main/Renderer/Render11Helper.cpp b/TR5Main/Renderer/Render11Helper.cpp index 334617b57..375271e73 100644 --- a/TR5Main/Renderer/Render11Helper.cpp +++ b/TR5Main/Renderer/Render11Helper.cpp @@ -5,7 +5,7 @@ #include "animation.h" #include "setup.h" #include "level.h" -#include "control.h" +#include "control/control.h" #include "lara.h" #include "sphere.h" #include "GameFlowScript.h" diff --git a/TR5Main/Renderer/Renderer11Compatibility.cpp b/TR5Main/Renderer/Renderer11Compatibility.cpp index 353e0d555..72867101f 100644 --- a/TR5Main/Renderer/Renderer11Compatibility.cpp +++ b/TR5Main/Renderer/Renderer11Compatibility.cpp @@ -3,7 +3,7 @@ #include "level.h" #include "savegame.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "objects.h" #include #include diff --git a/TR5Main/Renderer/Renderer11Draw.cpp b/TR5Main/Renderer/Renderer11Draw.cpp index e73461f77..00d4e2a47 100644 --- a/TR5Main/Renderer/Renderer11Draw.cpp +++ b/TR5Main/Renderer/Renderer11Draw.cpp @@ -16,7 +16,7 @@ #include "effects\tomb4fx.h" #include "level.h" #include "setup.h" -#include "control.h" +#include "control/control.h" #include "Sound\sound.h" #include "tr5_rats_emitter.h" #include "tr5_bats_emitter.h" diff --git a/TR5Main/Renderer/Renderer11Draw2D.cpp b/TR5Main/Renderer/Renderer11Draw2D.cpp index 57a077ae3..459061c84 100644 --- a/TR5Main/Renderer/Renderer11Draw2D.cpp +++ b/TR5Main/Renderer/Renderer11Draw2D.cpp @@ -3,7 +3,7 @@ #include "camera.h" #include "spotcam.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "effects\weather.h" using namespace TEN::Effects::Environment; diff --git a/TR5Main/Renderer/Renderer11DrawEffect.cpp b/TR5Main/Renderer/Renderer11DrawEffect.cpp index 6eab1e365..090f94e99 100644 --- a/TR5Main/Renderer/Renderer11DrawEffect.cpp +++ b/TR5Main/Renderer/Renderer11DrawEffect.cpp @@ -6,12 +6,12 @@ #include "lara.h" #include "animation.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "effects/debris.h" #include "setup.h" #include "effects/bubble.h" #include "level.h" -#include "box.h" +#include "control/box.h" #include "effects/smoke.h" #include "effects/spark.h" #include "effects/drip.h" diff --git a/TR5Main/Renderer/Renderer11Lara.cpp b/TR5Main/Renderer/Renderer11Lara.cpp index eec0e8818..38c1bfdf6 100644 --- a/TR5Main/Renderer/Renderer11Lara.cpp +++ b/TR5Main/Renderer/Renderer11Lara.cpp @@ -3,7 +3,7 @@ #include "animation.h" #include "effects\hair.h" #include "lara.h" -#include "control.h" +#include "control/control.h" #include "spotcam.h" #include "camera.h" #include "sphere.h" diff --git a/TR5Main/Scripting/GameLogicScript.cpp b/TR5Main/Scripting/GameLogicScript.cpp index b9828e4f6..7d775bb4e 100644 --- a/TR5Main/Scripting/GameLogicScript.cpp +++ b/TR5Main/Scripting/GameLogicScript.cpp @@ -2,10 +2,10 @@ #include "GameLogicScript.h" #include "ScriptAssert.h" #include "items.h" -#include "box.h" +#include "control/box.h" #include "lara.h" #include "savegame.h" -#include "lot.h" +#include "control/lot.h" #include "Sound\sound.h" #include "setup.h" #include "level.h" diff --git a/TR5Main/Scripting/GameScriptItemInfo.cpp b/TR5Main/Scripting/GameScriptItemInfo.cpp index d9aa8c10d..85a80c4e3 100644 --- a/TR5Main/Scripting/GameScriptItemInfo.cpp +++ b/TR5Main/Scripting/GameScriptItemInfo.cpp @@ -6,7 +6,7 @@ #include "objectslist.h" #include "level.h" #include "setup.h" -#include "lot.h" +#include "control/lot.h" #include "GameScriptPosition.h" #include "GameScriptRotation.h" #include "Specific\trmath.h" diff --git a/TR5Main/Sound/sound.cpp b/TR5Main/Sound/sound.cpp index c3e081305..ced7de983 100644 --- a/TR5Main/Sound/sound.cpp +++ b/TR5Main/Sound/sound.cpp @@ -4,7 +4,7 @@ #include "Sound/sound.h" #include "lara.h" #include "camera.h" -#include "control/flipmap.h" +#include "room.h" #include "configuration.h" #include "level.h" diff --git a/TR5Main/Sound/sound.h b/TR5Main/Sound/sound.h index 6e84a366d..71f329605 100644 --- a/TR5Main/Sound/sound.h +++ b/TR5Main/Sound/sound.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "control.h" +#include "control/control.h" #include "sound_effects.h" enum SFX_TYPES diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 9e0c2192d..85c0dc6b7 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -3,15 +3,16 @@ #include "level.h" #include "setup.h" #include "animation.h" -#include "lot.h" +#include "control/lot.h" #include "Lara.h" #include "savegame.h" #include "spotcam.h" #include "camera.h" -#include "control.h" +#include "control/control.h" #include "pickup.h" +#include "control/volume.h" #include "generic_doors.h" -#include "box.h" +#include "control/box.h" #include "sound.h" #include "GameFlowScript.h" #include diff --git a/TR5Main/Specific/level.h b/TR5Main/Specific/level.h index cd50fafc1..297082caa 100644 --- a/TR5Main/Specific/level.h +++ b/TR5Main/Specific/level.h @@ -6,7 +6,7 @@ #include "newtypes.h" #include "items.h" #include "room.h" -#include "item.h" +#include "items.h" #include "animation.h" #define AddPtr(p, t, n) p = (t*)((char*)(p) + (ptrdiff_t)(n)); diff --git a/TR5Main/Specific/setup.cpp b/TR5Main/Specific/setup.cpp index 4d2e37258..3cfa9eaa5 100644 --- a/TR5Main/Specific/setup.cpp +++ b/TR5Main/Specific/setup.cpp @@ -6,7 +6,7 @@ #include "effects/effects.h" #include "effects/tomb4fx.h" #include "switch.h" -#include "control/flipmap.h" +#include "room.h" #include "pickup.h" #include "camera.h" #include "objects.h" diff --git a/TR5Main/Specific/winmain.cpp b/TR5Main/Specific/winmain.cpp index 6f7236178..fa670663b 100644 --- a/TR5Main/Specific/winmain.cpp +++ b/TR5Main/Specific/winmain.cpp @@ -5,7 +5,7 @@ #ifndef NEW_INV #include "inventory.h" #endif -#include "control.h" +#include "control/control.h" #include "gameflow.h" #include "savegame.h" #include "level.h" diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj index 1f64bfe20..b939db29f 100644 --- a/TR5Main/TombEngine.vcxproj +++ b/TR5Main/TombEngine.vcxproj @@ -135,8 +135,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - - + @@ -150,7 +149,6 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - @@ -472,7 +470,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + @@ -491,7 +489,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + @@ -528,7 +526,6 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" Create Create - @@ -770,10 +767,10 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + - + @@ -792,7 +789,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\" - + diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters index 83b56c98d..1ca1e0182 100644 --- a/TR5Main/TombEngine.vcxproj.filters +++ b/TR5Main/TombEngine.vcxproj.filters @@ -24,18 +24,12 @@ File di intestazione - - File di intestazione - File di intestazione File di intestazione - - File di intestazione - File di intestazione @@ -147,9 +141,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -1026,9 +1017,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -1167,9 +1155,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -1182,29 +1167,29 @@ File di intestazione + + File di intestazione + + + File di intestazione + + + File di intestazione + - - File di origine - File di origine File di origine - - File di origine - File di origine File di origine - - File di origine - File di origine @@ -2114,9 +2099,6 @@ File di origine - - File di origine - File di origine @@ -2126,6 +2108,15 @@ File di origine + + File di origine + + + File di origine + + + File di origine +