TSAGE: Split up the hard-coded logic files for Ringworld and Blue Force into separate sub-folderes

31 files changed, 53 insertions, 53 deletions

diff --git a/engines/tsage/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index cad7609abc..87e1597e1d 100644
--- a/engines/tsage/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "tsage/blueforce_logic.h"
-#include "tsage/blueforce_scenes0.h"
-#include "tsage/blueforce_scenes1.h"
+#include "tsage/blue_force/blueforce_logic.h"
+#include "tsage/blue_force/blueforce_scenes0.h"
+#include "tsage/blue_force/blueforce_scenes1.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 9237e50a13..9237e50a13 100644
--- a/engines/tsage/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
diff --git a/engines/tsage/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 4a0259cb98..3eaa2bfdab 100644
--- a/engines/tsage/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "tsage/blueforce_scenes0.h"
+#include "tsage/blue_force/blueforce_scenes0.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 06f7912959..c176a17110 100644
--- a/engines/tsage/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -24,7 +24,7 @@
 #define TSAGE_BLUEFORCE_SCENES0_H
 
 #include "common/scummsys.h"
-#include "tsage/blueforce_logic.h"
+#include "tsage/blue_force/blueforce_logic.h"
 #include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
diff --git a/engines/tsage/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index 81f7d0ac76..0f0ab6c1c3 100644
--- a/engines/tsage/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/config-manager.h"
-#include "tsage/blueforce_scenes1.h"
+#include "tsage/blue_force/blueforce_scenes1.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h
index d9fcc486c6..16d327fe9f 100644
--- a/engines/tsage/blueforce_scenes1.h
+++ b/engines/tsage/blue_force/blueforce_scenes1.h
@@ -24,7 +24,7 @@
 #define TSAGE_BLUEFORCE_SCENES1_H
 
 #include "common/scummsys.h"
-#include "tsage/blueforce_logic.h"
+#include "tsage/blue_force/blueforce_logic.h"
 #include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index 00cd61ae07..cae9639565 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -23,7 +23,7 @@
 #include "tsage/debugger.h"
 #include "tsage/globals.h"
 #include "tsage/graphics.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp
index d315ce092b..8a1b7c6429 100644
--- a/engines/tsage/dialogs.cpp
+++ b/engines/tsage/dialogs.cpp
@@ -30,7 +30,7 @@
 #include "tsage/dialogs.h"
 #include "tsage/staticres.h"
 #include "tsage/globals.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e5572d9058..39850cd1a5 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -22,9 +22,9 @@
 
 #include "tsage/globals.h"
 #include "tsage/tsage.h"
-#include "tsage/blueforce_logic.h"
-#include "tsage/ringworld_demo.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/blue_force/blueforce_logic.h"
+#include "tsage/ringworld/ringworld_demo.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk
index 7ac1795537..41078cdaaf 100644
--- a/engines/tsage/module.mk
+++ b/engines/tsage/module.mk
@@ -1,9 +1,9 @@
 MODULE := engines/tsage
 
 MODULE_OBJS := \
-	blueforce_logic.o \
-	blueforce_scenes0.o \
-	blueforce_scenes1.o \
+	blue_force\blueforce_logic.o \
+	blue_force\blueforce_scenes0.o \
+	blue_force\blueforce_scenes1.o \
 	converse.o \
 	core.o \
 	debugger.o \
@@ -13,16 +13,16 @@ MODULE_OBJS := \
 	globals.o \
 	graphics.o \
 	resources.o \
-	ringworld_demo.o \
-	ringworld_logic.o \
-	ringworld_scenes1.o \
-	ringworld_scenes2.o \
-	ringworld_scenes3.o \
-	ringworld_scenes4.o \
-	ringworld_scenes5.o \
-	ringworld_scenes6.o \
-	ringworld_scenes8.o \
-	ringworld_scenes10.o \
+	ringworld\ringworld_demo.o \
+	ringworld\ringworld_logic.o \
+	ringworld\ringworld_scenes1.o \
+	ringworld\ringworld_scenes2.o \
+	ringworld\ringworld_scenes3.o \
+	ringworld\ringworld_scenes4.o \
+	ringworld\ringworld_scenes5.o \
+	ringworld\ringworld_scenes6.o \
+	ringworld\ringworld_scenes8.o \
+	ringworld\ringworld_scenes10.o \
 	saveload.o \
 	scenes.o \
 	sound.o \
diff --git a/engines/tsage/ringworld_demo.cpp b/engines/tsage/ringworld/ringworld_demo.cpp
index b24fec98f9..ce06df8e80 100644
--- a/engines/tsage/ringworld_demo.cpp
+++ b/engines/tsage/ringworld/ringworld_demo.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "tsage/ringworld_demo.h"
+#include "tsage/ringworld/ringworld_demo.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_demo.h b/engines/tsage/ringworld/ringworld_demo.h
index 3e7431e107..3e7431e107 100644
--- a/engines/tsage/ringworld_demo.h
+++ b/engines/tsage/ringworld/ringworld_demo.h
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 070d8afd25..99890c90ff 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -23,19 +23,19 @@
 #include "common/config-manager.h"
 #include "common/translation.h"
 #include "gui/saveload.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
-#include "tsage/ringworld_demo.h"
-#include "tsage/ringworld_scenes1.h"
-#include "tsage/ringworld_scenes2.h"
-#include "tsage/ringworld_scenes3.h"
-#include "tsage/ringworld_scenes4.h"
-#include "tsage/ringworld_scenes5.h"
-#include "tsage/ringworld_scenes6.h"
-#include "tsage/ringworld_scenes8.h"
-#include "tsage/ringworld_scenes10.h"
+#include "tsage/ringworld/ringworld_demo.h"
+#include "tsage/ringworld/ringworld_scenes1.h"
+#include "tsage/ringworld/ringworld_scenes2.h"
+#include "tsage/ringworld/ringworld_scenes3.h"
+#include "tsage/ringworld/ringworld_scenes4.h"
+#include "tsage/ringworld/ringworld_scenes5.h"
+#include "tsage/ringworld/ringworld_scenes6.h"
+#include "tsage/ringworld/ringworld_scenes8.h"
+#include "tsage/ringworld/ringworld_scenes10.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index 19b0f10b42..19b0f10b42 100644
--- a/engines/tsage/ringworld_logic.h
+++ b/engines/tsage/ringworld/ringworld_logic.h
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp
index f97cfa4ae6..880fa51e6e 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes1.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "tsage/ringworld_scenes1.h"
+#include "tsage/ringworld/ringworld_scenes1.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld/ringworld_scenes1.h
index 0f9bf61117..dd64e563cd 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld/ringworld_scenes1.h
@@ -24,7 +24,7 @@
 #define TSAGE_RINGWORLD_SCENES1_H
 
 #include "common/scummsys.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index 839fa0f008..1cff5d0aaf 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "graphics/cursorman.h"
-#include "tsage/ringworld_scenes10.h"
+#include "tsage/ringworld/ringworld_scenes10.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes10.h b/engines/tsage/ringworld/ringworld_scenes10.h
index 33b16d0014..792234cc91 100644
--- a/engines/tsage/ringworld_scenes10.h
+++ b/engines/tsage/ringworld/ringworld_scenes10.h
@@ -24,7 +24,7 @@
 #define TSAGE_RINGWORLD_SCENES10_H
 
 #include "common/scummsys.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
diff --git a/engines/tsage/ringworld_scenes2.cpp b/engines/tsage/ringworld/ringworld_scenes2.cpp
index 0154123c3d..2dadaf4c30 100644
--- a/engines/tsage/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes2.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/config-manager.h"
-#include "tsage/ringworld_scenes2.h"
+#include "tsage/ringworld/ringworld_scenes2.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes2.h b/engines/tsage/ringworld/ringworld_scenes2.h
index 93a8f04fd4..ef3158bbb9 100644
--- a/engines/tsage/ringworld_scenes2.h
+++ b/engines/tsage/ringworld/ringworld_scenes2.h
@@ -24,7 +24,7 @@
 #define TSAGE_RINGWORLD_SCENES2_H
 
 #include "common/scummsys.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 209144766a..3d8f151c35 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/config-manager.h"
-#include "tsage/ringworld_scenes3.h"
+#include "tsage/ringworld/ringworld_scenes3.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index 711360c190..4f8f559091 100644
--- a/engines/tsage/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "tsage/core.h"
 #include "tsage/converse.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/ringworld_scenes4.cpp b/engines/tsage/ringworld/ringworld_scenes4.cpp
index 838769e4af..83dd559a6d 100644
--- a/engines/tsage/ringworld_scenes4.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes4.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/config-manager.h"
-#include "tsage/ringworld_scenes4.h"
+#include "tsage/ringworld/ringworld_scenes4.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes4.h b/engines/tsage/ringworld/ringworld_scenes4.h
index 0b575d02d3..6c706d2dab 100644
--- a/engines/tsage/ringworld_scenes4.h
+++ b/engines/tsage/ringworld/ringworld_scenes4.h
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "tsage/core.h"
 #include "tsage/converse.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index fccc7e1b50..0803a2039a 100644
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/config-manager.h"
-#include "tsage/ringworld_scenes5.h"
+#include "tsage/ringworld/ringworld_scenes5.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes5.h b/engines/tsage/ringworld/ringworld_scenes5.h
index c3ae9f4aa9..d28e809678 100644
--- a/engines/tsage/ringworld_scenes5.h
+++ b/engines/tsage/ringworld/ringworld_scenes5.h
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "tsage/core.h"
 #include "tsage/converse.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 
 namespace tSage {
 
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 68c184196c..6b335fe7c3 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "tsage/ringworld_scenes6.h"
+#include "tsage/ringworld/ringworld_scenes6.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index 2e99f5ab87..db6efd0e18 100644
--- a/engines/tsage/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -24,7 +24,7 @@
 #define TSAGE_RINGWORLD_SCENES6_H
 
 #include "common/scummsys.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp
index d0e7491d4a..5b01bb2c58 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes8.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "graphics/cursorman.h"
-#include "tsage/ringworld_scenes8.h"
+#include "tsage/ringworld/ringworld_scenes8.h"
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
diff --git a/engines/tsage/ringworld_scenes8.h b/engines/tsage/ringworld/ringworld_scenes8.h
index fe9560d9d8..e4f82fc164 100644
--- a/engines/tsage/ringworld_scenes8.h
+++ b/engines/tsage/ringworld/ringworld_scenes8.h
@@ -24,7 +24,7 @@
 #define TSAGE_RINGWORLD_SCENES8_H
 
 #include "common/scummsys.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 6a164a6b1e..954c63e081 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -22,7 +22,7 @@
 
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
-#include "tsage/ringworld_logic.h"
+#include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/tsage.h"
 #include "tsage/saveload.h"