Fix includes.

(cherry picked from commit 7095978be330604dfffa7b271663c9e5a85978b2)

TombEngine/Game/Lara/lara.cpp

@@ -32,8 +32,8 @@
 #include "Game/items.h"
 #include "Game/misc.h"
 #include "Game/savegame.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 #include "Sound/sound.h"
 #include "Renderer/Renderer11.h"
 

TombEngine/Game/Lara/lara_basic.cpp

@@ -17,7 +17,7 @@
 #include "Specific/input.h"
 #include "Specific/level.h"
 #include "Specific/setup.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 
 // ------------------------------
 // BASIC MOVEMENT & MISCELLANEOUS

TombEngine/Game/Lara/lara_cheat.cpp

@@ -5,7 +5,7 @@
 #include "Game/effects/effects.h"
 #include "Game/items.h"
 #include "Game/Lara/lara.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Game/Lara/lara_helpers.h"
 #include "Sound/sound.h"
 #include "Specific/input.h"

TombEngine/Game/Lara/lara_climb.cpp

@@ -11,7 +11,7 @@
 #include "Game/Lara/lara_overhang.h"
 #include "Specific/level.h"
 #include "Specific/input.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 
 // -----------------------------
 // LADDER CLIMB

TombEngine/Game/Lara/lara_collide.cpp

@@ -14,8 +14,8 @@
 #include "Specific/input.h"
 #include "Specific/level.h"
 #include "Specific/setup.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 
 // -----------------------------
 // COLLISION TEST FUNCTIONS

TombEngine/Game/Lara/lara_crawl.cpp

@@ -14,7 +14,7 @@
 #include "Game/Lara/lara_helpers.h"
 #include "Specific/input.h"
 #include "Specific/level.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 
 // -----------------------------
 // CROUCH & CRAWL

TombEngine/Game/Lara/lara_fire.cpp

@@ -18,15 +18,15 @@
 #include "Game/savegame.h"
 #include "Objects/Generic/Object/burning_torch.h"
 #include "Objects/Generic/Object/objects.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 #include "Sound/sound.h"
 #include "Specific/setup.h"
 #include "Specific/input.h"
 #include "Specific/level.h"
 
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 
 using namespace TEN::Entities::Generic;
 

TombEngine/Game/Lara/lara_helpers.cpp

@@ -6,7 +6,7 @@
 #include "Game/items.h"
 #include "Game/Lara/lara.h"
 #include "Game/Lara/lara_collide.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Game/Lara/lara_fire.h"
 #include "Game/Lara/lara_tests.h"
 #include "Renderer/Renderer11.h"

TombEngine/Game/Lara/lara_jump.cpp

@@ -10,7 +10,7 @@
 #include "Game/Lara/lara_basic.h"
 #include "Game/Lara/lara_overhang.h"
 #include "Game/Lara/lara_slide.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Sound/sound.h"
 #include "Specific/input.h"
 #include "Specific/level.h"

TombEngine/Game/Lara/lara_monkey.cpp

@@ -14,7 +14,7 @@
 #include "Game/Lara/lara_tests.h"
 #include "Specific/input.h"
 #include "Specific/level.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 
 // -----------------------------
 // MONKEY SWING

TombEngine/Game/Lara/lara_overhang.cpp

@@ -12,7 +12,7 @@
 #include "Game/items.h"
 #include "Specific/input.h"
 #include "Specific/setup.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/level.h"
 
 constexpr auto HORIZONTAL_ALIGN_NORTHEAST = 155;

TombEngine/Game/Lara/lara_swim.cpp

@@ -8,8 +8,8 @@
 #include "Game/Lara/lara_collide.h"
 #include "Game/Lara/lara_helpers.h"
 #include "Game/Lara/lara.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 #include "Sound/sound.h"
 #include "Specific/level.h"
 #include "Specific/input.h"

TombEngine/Game/Lara/lara_tests.cpp

@@ -14,7 +14,7 @@
 #include "Game/Lara/lara_helpers.h"
 #include "Game/Lara/lara_monkey.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/input.h"
 #include "Specific/level.h"
 

TombEngine/Game/collision/collide_item.cpp

@@ -15,7 +15,7 @@
 #include "Specific/trmath.h"
 #include "Specific/prng.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
 
 using namespace TEN::Math::Random;
 using namespace TEN::Renderer;

TombEngine/Game/control/control.cpp

@@ -45,10 +45,10 @@
 #include "Specific/setup.h"
 #include "Specific/prng.h"
 #include "Specific/winmain.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
-#include "Scripting/Strings/ScriptInterfaceStringsHandler.h"
+#include "Strings/ScriptInterfaceStringsHandler.h"
 
 using std::vector;
 using std::unordered_map;

TombEngine/Game/control/los.cpp

@@ -10,12 +10,12 @@
 #include "Game/Lara/lara_one_gun.h"
 #include "Objects/Generic/Object/objects.h"
 #include "Objects/Generic/Switches/switch.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
 #include "Sound/sound.h"
 #include "Specific/input.h"
 #include "Specific/setup.h"
 
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 
 int NumberLosRooms;
 short LosRooms[20];

TombEngine/Game/control/volume.cpp

@@ -9,7 +9,7 @@
 #include "Specific/setup.h"
 #include "Renderer/Renderer11Enums.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
 
 using TEN::Renderer::g_Renderer;
 

TombEngine/Game/effects/effects.cpp

@@ -19,7 +19,7 @@
 #include "Specific/setup.h"
 #include "Specific/prng.h"
 #include "Specific/trmath.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Renderer/Renderer11.h"
 
 using TEN::Renderer::g_Renderer;

TombEngine/Game/effects/hair.cpp

@@ -9,7 +9,7 @@
 #include "Game/items.h"
 #include "Game/Lara/lara.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/setup.h"
 #include "Specific/level.h"
 

TombEngine/Game/effects/lightning.cpp

@@ -10,7 +10,7 @@
 #include "Game/Lara/lara.h"
 #include "Renderer/Renderer11.h"
 #include "Sound/sound.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/setup.h"
 #include "Specific/level.h"
 #include "Specific/trmath.h"

TombEngine/Game/effects/tomb4fx.cpp

@@ -12,7 +12,7 @@
 #include "Game/items.h"
 #include "Game/Lara/lara.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Sound/sound.h"
 #include "Specific/level.h"
 #include "Specific/setup.h"

TombEngine/Game/effects/weather.cpp

@@ -10,7 +10,7 @@
 #include "Specific/prng.h"
 #include "Specific/setup.h"
 #include "Specific/level.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 
 using namespace TEN::Math::Random;
 

TombEngine/Game/effects/weather.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <SimpleMath.h>
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 #include "Specific/trmath.h"
 
 namespace TEN {

TombEngine/Game/gui.cpp

@@ -19,7 +19,7 @@
 #include "Specific/input.h"
 #include "Specific/configuration.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
 
 using namespace TEN::Renderer;
 GuiController g_Gui;

TombEngine/Game/gui.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Scripting/LanguageScript.h"
+#include "LanguageScript.h"
 #include "Specific/configuration.h"
 
 enum class InventoryMode

TombEngine/Game/items.cpp

@@ -5,10 +5,10 @@
 #include "Game/collision/floordata.h"
 #include "Game/effects/effects.h"
 #include "Game/Lara/lara.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
 #include "Specific/setup.h"
 #include "Specific/level.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 
 using namespace TEN::Floordata;
 

TombEngine/Game/savegame.cpp

@@ -26,9 +26,9 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 #include "Specific/savegame/flatbuffers/ten_savegame_generated.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 
 
 using namespace TEN::Effects::Lara;

TombEngine/Game/savegame.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/IO/ChunkId.h"
 #include "Specific/IO/ChunkReader.h"
 #include "Specific/IO/ChunkWriter.h"

TombEngine/Renderer/Renderer11Helper.cpp

@@ -8,7 +8,7 @@
 #include "Game/control/control.h"
 #include "Game/Lara/lara.h"
 #include "Game/collision/sphere.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Renderer\RenderView\RenderView.h"
 #include "Objects/TR3/Vehicles/quad.h"
 #include "Objects/TR3/Vehicles/rubberboat.h"

TombEngine/Renderer/Renderer11Init.cpp

@@ -2,7 +2,7 @@
 #include "Renderer/Renderer11.h"
 #include "Specific/configuration.h"
 #include "Specific/winmain.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Quad/RenderQuad.h"
 #include "Specific/memory/Vector.h"
 #include <string>

TombEngine/Renderer/Renderer11Lara.cpp

@@ -8,7 +8,7 @@
 #include "Game/camera.h"
 #include "Game/collision/sphere.h"
 #include "Specific/level.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include <Specific\setup.h>
 #include "Game/Lara/lara_fire.h"
 #include "Game/items.h"

TombEngine/Scripting/Internal/TEN/Logic/LogicHandler.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
 #include "Game/items.h"
 #include "LuaHandler.h"
 #include <unordered_set>

TombEngine/Scripting/Internal/TEN/Objects/ObjectsHandler.h

@@ -2,7 +2,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "LuaHandler.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 #include "Objects/Moveable/MoveableObject.h"
 #include "Objects/Static/StaticObject.h"
 #include "Objects/AIObject/AIObject.h"

TombEngine/Scripting/Internal/TEN/Strings/StringsHandler.h

@@ -3,7 +3,7 @@
 #include <optional>
 #include "LuaHandler.h"
 #include "DisplayString/DisplayString.h"
-#include "Scripting/Strings/ScriptInterfaceStringsHandler.h"
+#include "Strings/ScriptInterfaceStringsHandler.h"
 
 using DisplayStringMap = std::unordered_map<DisplayStringIDType, UserDisplayString>;
 

TombEngine/Specific/configuration.cpp

@@ -4,8 +4,8 @@
 #include <CommCtrl.h>
 #include "resource.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/LanguageScript.h"
+#include "LanguageScript.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
 #include "Specific/input.h"
 #include "Specific/winmain.h"
 #include "Sound/sound.h"

TombEngine/Specific/level.cpp

@@ -18,10 +18,10 @@
 #include "Game/spotcam.h"
 #include "Objects/Generic/Doors/generic_doors.h"
 #include "Renderer/Renderer11.h"
-#include "Scripting/Flow/ScriptInterfaceFlowHandler.h"
+#include "Flow/ScriptInterfaceFlowHandler.h"
-#include "Scripting/ScriptInterfaceGame.h"
+#include "ScriptInterfaceGame.h"
-#include "Scripting/ScriptInterfaceLevel.h"
+#include "ScriptInterfaceLevel.h"
-#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
+#include "Objects/ScriptInterfaceObjectsHandler.h"
 #include "Sound/sound.h"
 #include "Specific/setup.h"
 

TombEngine/Specific/winmain.cpp

@@ -11,8 +11,8 @@
 #include "Sound/sound.h"
 #include "Specific/level.h"
 #include "Specific/configuration.h"
-#include "Scripting/LanguageScript.h"
+#include "LanguageScript.h"
-#include "Scripting/ScriptInterfaceState.h"
+#include "ScriptInterfaceState.h"
 
 using namespace TEN::Renderer;
 using std::exception;