ILLUSIONS: Move thread-related files into threads subdirectory

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 {
 

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"

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"

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"

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

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 {
 

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 {
 

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 {
 

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"
 

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"
 

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 {

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"

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"

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"