ILLUSIONS: Move thread-related files into threads subdirectory

20 files changed, 26 insertions, 26 deletions

diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp
index 65eff5d1ed..bf7b0cc2f5 100644
--- a/engines/illusions/actor.cpp
+++ b/engines/illusions/actor.cpp
@@ -30,8 +30,8 @@
 #include "illusions/screen.h"
 #include "illusions/scriptopcodes.h"
 #include "illusions/sequenceopcodes.h"
-#include "illusions/talkthread.h"
 #include "illusions/thread.h"
+#include "illusions/threads/talkthread.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index 95b00279b4..93619a054a 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -42,7 +42,7 @@
 #include "illusions/time.h"
 #include "illusions/updatefunctions.h"
 
-#include "illusions/talkthread.h"
+#include "illusions/threads/talkthread.h"
 
 #include "audio/audiostream.h"
 #include "common/config-manager.h"
diff --git a/engines/illusions/illusions_bbdou.cpp b/engines/illusions/illusions_bbdou.cpp
index b71f4fe203..3766c00fc0 100644
--- a/engines/illusions/illusions_bbdou.cpp
+++ b/engines/illusions/illusions_bbdou.cpp
@@ -45,10 +45,10 @@
 #include "illusions/time.h"
 #include "illusions/updatefunctions.h"
 
-#include "illusions/abortablethread.h"
-#include "illusions/scriptthread.h"
-#include "illusions/talkthread.h"
-#include "illusions/timerthread.h"
+#include "illusions/threads/abortablethread.h"
+#include "illusions/threads/scriptthread.h"
+#include "illusions/threads/talkthread.h"
+#include "illusions/threads/timerthread.h"
 
 #include "audio/audiostream.h"
 #include "common/config-manager.h"
diff --git a/engines/illusions/illusions_duckman.cpp b/engines/illusions/illusions_duckman.cpp
index f9705b6ef8..50aea3dd7a 100644
--- a/engines/illusions/illusions_duckman.cpp
+++ b/engines/illusions/illusions_duckman.cpp
@@ -46,11 +46,11 @@
 #include "illusions/time.h"
 #include "illusions/updatefunctions.h"
 
-#include "illusions/abortablethread.h"
-#include "illusions/causethread_duckman.h"
-#include "illusions/scriptthread.h"
-#include "illusions/talkthread_duckman.h"
-#include "illusions/timerthread.h"
+#include "illusions/threads/abortablethread.h"
+#include "illusions/threads/causethread_duckman.h"
+#include "illusions/threads/scriptthread.h"
+#include "illusions/threads/talkthread_duckman.h"
+#include "illusions/threads/timerthread.h"
 
 #include "audio/audiostream.h"
 #include "common/config-manager.h"
diff --git a/engines/illusions/module.mk b/engines/illusions/module.mk
index ec52049239..63e0210902 100644
--- a/engines/illusions/module.mk
+++ b/engines/illusions/module.mk
@@ -1,7 +1,6 @@
 MODULE := engines/illusions
 
 MODULE_OBJS := \
-	abortablethread.o \
 	actor.o \
 	actorresource.o \
 	backgroundresource.o \
@@ -10,7 +9,6 @@ MODULE_OBJS := \
 	bbdou/bbdou_inventory.o \
 	bbdou/bbdou_specialcode.o \
 	camera.o \
-	causethread_duckman.o \
 	cursor.o \
 	detection.o \
 	dictionary.o \
@@ -31,18 +29,20 @@ MODULE_OBJS := \
 	scriptopcodes_bbdou.o \
 	scriptopcodes_duckman.o \
 	scriptresource.o \
-	scriptthread.o \
 	sequenceopcodes.o \
 	sound.o \
 	soundresource.o \
 	specialcode.o \
 	talkresource.o \
-	talkthread.o \
-	talkthread_duckman.o \
 	textdrawer.o \
 	thread.o \
+	threads/abortablethread.o \
+	threads/causethread_duckman.o \
+	threads/scriptthread.o \
+	threads/talkthread.o \
+	threads/talkthread_duckman.o \
+	threads/timerthread.o \
 	time.o \
-	timerthread.o \
 	updatefunctions.o
 
 # This module can be built as a plugin
diff --git a/engines/illusions/scriptopcodes.cpp b/engines/illusions/scriptopcodes.cpp
index c8817f6aca..7d515a8109 100644
--- a/engines/illusions/scriptopcodes.cpp
+++ b/engines/illusions/scriptopcodes.cpp
@@ -22,7 +22,7 @@
 
 #include "illusions/illusions.h"
 #include "illusions/scriptopcodes.h"
-#include "illusions/scriptthread.h"
+#include "illusions/threads/scriptthread.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/scriptopcodes_bbdou.cpp b/engines/illusions/scriptopcodes_bbdou.cpp
index e152c34074..03990c81a1 100644
--- a/engines/illusions/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/scriptopcodes_bbdou.cpp
@@ -29,10 +29,10 @@
 #include "illusions/screen.h"
 #include "illusions/scriptstack.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptthread.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
 #include "illusions/talkresource.h"
+#include "illusions/threads/scriptthread.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/scriptopcodes_duckman.cpp b/engines/illusions/scriptopcodes_duckman.cpp
index 8dd6af1155..076a4008fb 100644
--- a/engines/illusions/scriptopcodes_duckman.cpp
+++ b/engines/illusions/scriptopcodes_duckman.cpp
@@ -29,10 +29,10 @@
 #include "illusions/screen.h"
 #include "illusions/scriptstack.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptthread.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
 #include "illusions/talkresource.h"
+#include "illusions/threads/scriptthread.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/abortablethread.cpp b/engines/illusions/threads/abortablethread.cpp
index 15c8f6c82b..348bc9c49a 100644
--- a/engines/illusions/abortablethread.cpp
+++ b/engines/illusions/threads/abortablethread.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/abortablethread.h"
+#include "illusions/threads/abortablethread.h"
 #include "illusions/input.h"
 #include "illusions/time.h"
 
diff --git a/engines/illusions/abortablethread.h b/engines/illusions/threads/abortablethread.h
index 8fc2a47fce..8fc2a47fce 100644
--- a/engines/illusions/abortablethread.h
+++ b/engines/illusions/threads/abortablethread.h
diff --git a/engines/illusions/causethread_duckman.cpp b/engines/illusions/threads/causethread_duckman.cpp
index 4fbe49e309..091b85c78d 100644
--- a/engines/illusions/causethread_duckman.cpp
+++ b/engines/illusions/threads/causethread_duckman.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions_duckman.h"
-#include "illusions/causethread_duckman.h"
+#include "illusions/threads/causethread_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/input.h"
 
diff --git a/engines/illusions/causethread_duckman.h b/engines/illusions/threads/causethread_duckman.h
index 97bf00e7cb..97bf00e7cb 100644
--- a/engines/illusions/causethread_duckman.h
+++ b/engines/illusions/threads/causethread_duckman.h
diff --git a/engines/illusions/scriptthread.cpp b/engines/illusions/threads/scriptthread.cpp
index a820289183..f8bbae9cb4 100644
--- a/engines/illusions/scriptthread.cpp
+++ b/engines/illusions/threads/scriptthread.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/scriptthread.h"
+#include "illusions/threads/scriptthread.h"
 #include "illusions/scriptopcodes.h"
 
 namespace Illusions {
diff --git a/engines/illusions/scriptthread.h b/engines/illusions/threads/scriptthread.h
index 0306c4f1cd..0306c4f1cd 100644
--- a/engines/illusions/scriptthread.h
+++ b/engines/illusions/threads/scriptthread.h
diff --git a/engines/illusions/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 7d97588d8c..3a4d286f66 100644
--- a/engines/illusions/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/talkthread.h"
+#include "illusions/threads/talkthread.h"
 #include "illusions/actor.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
diff --git a/engines/illusions/talkthread.h b/engines/illusions/threads/talkthread.h
index ada593b571..ada593b571 100644
--- a/engines/illusions/talkthread.h
+++ b/engines/illusions/threads/talkthread.h
diff --git a/engines/illusions/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 6807c9869c..67c394cd75 100644
--- a/engines/illusions/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions_duckman.h"
-#include "illusions/talkthread_duckman.h"
+#include "illusions/threads/talkthread_duckman.h"
 #include "illusions/actor.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
diff --git a/engines/illusions/talkthread_duckman.h b/engines/illusions/threads/talkthread_duckman.h
index b729ad2d8f..b729ad2d8f 100644
--- a/engines/illusions/talkthread_duckman.h
+++ b/engines/illusions/threads/talkthread_duckman.h
diff --git a/engines/illusions/timerthread.cpp b/engines/illusions/threads/timerthread.cpp
index 95b30fec24..714c719bc9 100644
--- a/engines/illusions/timerthread.cpp
+++ b/engines/illusions/threads/timerthread.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/timerthread.h"
+#include "illusions/threads/timerthread.h"
 #include "illusions/input.h"
 #include "illusions/time.h"
 
diff --git a/engines/illusions/timerthread.h b/engines/illusions/threads/timerthread.h
index d283dc40ba..d283dc40ba 100644
--- a/engines/illusions/timerthread.h
+++ b/engines/illusions/threads/timerthread.h