ILLUSIONS: Move resource-related files into resources subdirectory

engines/illusions/actor.h

@@ -23,8 +23,8 @@
 #ifndef ILLUSIONS_ACTOR_H
 #define ILLUSIONS_ACTOR_H
 
-#include "illusions/actorresource.h"
-#include "illusions/backgroundresource.h"
+#include "illusions/resources/actorresource.h"
+#include "illusions/resources/backgroundresource.h"
 #include "illusions/graphics.h"
 #include "illusions/pathfinder.h"
 #include "common/algorithm.h"

engines/illusions/camera.cpp

@@ -22,8 +22,8 @@
 
 #include "illusions/illusions.h"
 #include "illusions/camera.h"
-#include "illusions/backgroundresource.h"
 #include "illusions/fixedpoint.h"
+#include "illusions/resources/backgroundresource.h"
 #include "illusions/time.h"
 
 namespace Illusions {

engines/illusions/dictionary.cpp

@@ -22,10 +22,10 @@
 
 #include "illusions/illusions.h"
 #include "illusions/dictionary.h"
-#include "illusions/actorresource.h"
-#include "illusions/backgroundresource.h"
-#include "illusions/fontresource.h"
-#include "illusions/talkresource.h"
+#include "illusions/resources/actorresource.h"
+#include "illusions/resources/backgroundresource.h"
+#include "illusions/resources/fontresource.h"
+#include "illusions/resources/talkresource.h"
 
 namespace Illusions {
 

engines/illusions/illusions.cpp

@@ -22,22 +22,22 @@
 
 #include "illusions/illusions.h"
 #include "illusions/actor.h"
-#include "illusions/actorresource.h"
-#include "illusions/backgroundresource.h"
 #include "illusions/camera.h"
 #include "illusions/cursor.h"
 #include "illusions/dictionary.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "illusions/graphics.h"
 #include "illusions/input.h"
+#include "illusions/resources/actorresource.h"
+#include "illusions/resources/backgroundresource.h"
+#include "illusions/resources/scriptresource.h"
+#include "illusions/resources/soundresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
-#include "illusions/scriptresource.h"
 #include "illusions/sound.h"
-#include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
-#include "illusions/talkresource.h"
 #include "illusions/thread.h"
 #include "illusions/time.h"
 #include "illusions/updatefunctions.h"

engines/illusions/illusions_bbdou.cpp

@@ -22,25 +22,25 @@
 
 #include "illusions/illusions_bbdou.h"
 #include "illusions/actor.h"
-#include "illusions/actorresource.h"
-#include "illusions/backgroundresource.h"
 #include "illusions/camera.h"
 #include "illusions/cursor.h"
 #include "illusions/dictionary.h"
-#include "illusions/fontresource.h"
 #include "illusions/graphics.h"
 #include "illusions/input.h"
+#include "illusions/resources/actorresource.h"
+#include "illusions/resources/backgroundresource.h"
+#include "illusions/resources/fontresource.h"
+#include "illusions/resources/scriptresource.h"
+#include "illusions/resources/soundresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
 #include "illusions/scriptstack.h"
 #include "illusions/scriptopcodes_bbdou.h"
-#include "illusions/scriptresource.h"
 #include "illusions/sound.h"
-#include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
 #include "illusions/bbdou/bbdou_specialcode.h"
-#include "illusions/talkresource.h"
 #include "illusions/thread.h"
 #include "illusions/time.h"
 #include "illusions/updatefunctions.h"

engines/illusions/illusions_duckman.cpp

@@ -22,25 +22,25 @@
 
 #include "illusions/illusions_duckman.h"
 #include "illusions/actor.h"
-#include "illusions/actorresource.h"
-#include "illusions/backgroundresource.h"
 #include "illusions/camera.h"
 #include "illusions/cursor.h"
 #include "illusions/dictionary.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "illusions/graphics.h"
 #include "illusions/input.h"
-#include "illusions/midiresource.h"
+#include "illusions/resources/actorresource.h"
+#include "illusions/resources/backgroundresource.h"
+#include "illusions/resources/midiresource.h"
+#include "illusions/resources/scriptresource.h"
+#include "illusions/resources/soundresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
 #include "illusions/scriptopcodes_duckman.h"
-#include "illusions/scriptresource.h"
 #include "illusions/scriptstack.h"
 #include "illusions/sound.h"
-#include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
-#include "illusions/talkresource.h"
 #include "illusions/textdrawer.h"
 #include "illusions/thread.h"
 #include "illusions/time.h"

engines/illusions/module.mk

@@ -2,8 +2,6 @@ MODULE := engines/illusions
 
 MODULE_OBJS := \
 	actor.o \
-	actorresource.o \
-	backgroundresource.o \
 	bbdou/bbdou_bubble.o \
 	bbdou/bbdou_cursor.o \
 	bbdou/bbdou_inventory.o \
@@ -13,14 +11,19 @@ MODULE_OBJS := \
 	detection.o \
 	dictionary.o \
 	fixedpoint.o \
-	fontresource.o \
 	graphics.o \
 	illusions.o \
 	illusions_bbdou.o \
 	illusions_duckman.o \
 	input.o \
-	midiresource.o \
 	pathfinder.o \
+	resources/actorresource.o \
+	resources/backgroundresource.o \
+	resources/fontresource.o \
+	resources/midiresource.o \
+	resources/scriptresource.o \
+	resources/soundresource.o \
+	resources/talkresource.o \
 	resourcesystem.o \
 	screen.o \
 	screentext.o \
@@ -28,20 +31,17 @@ MODULE_OBJS := \
 	scriptopcodes.o \
 	scriptopcodes_bbdou.o \
 	scriptopcodes_duckman.o \
-	scriptresource.o \
 	sequenceopcodes.o \
 	sound.o \
-	soundresource.o \
 	specialcode.o \
-	talkresource.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 \
+	thread.o \
 	time.o \
 	updatefunctions.o
 

engines/illusions/resources/actorresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/actorresource.h"
+#include "illusions/resources/actorresource.h"
 #include "illusions/dictionary.h"
 
 namespace Illusions {

engines/illusions/resources/backgroundresource.cpp

@@ -21,11 +21,11 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/backgroundresource.h"
+#include "illusions/resources/backgroundresource.h"
 #include "illusions/actor.h"
-#include "illusions/actorresource.h"
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
+#include "illusions/resources/actorresource.h"
 #include "illusions/screen.h"
 #include "common/str.h"
 

engines/illusions/resources/fontresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "illusions/dictionary.h"
 
 namespace Illusions {

engines/illusions/resources/midiresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/midiresource.h"
+#include "illusions/resources/midiresource.h"
 
 namespace Illusions {
 

engines/illusions/resources/scriptresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/scriptresource.h"
+#include "illusions/resources/scriptresource.h"
 
 namespace Illusions {
 

engines/illusions/resources/soundresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/soundresource.h"
+#include "illusions/resources/soundresource.h"
 #include "illusions/sound.h"
 
 namespace Illusions {

engines/illusions/resources/talkresource.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/talkresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/dictionary.h"
 
 namespace Illusions {

engines/illusions/screen.cpp

@@ -22,7 +22,7 @@
 
 #include "illusions/illusions.h"
 #include "illusions/screen.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "engines/util.h"
 #include "graphics/palette.h"
 

engines/illusions/screentext.cpp

@@ -23,7 +23,7 @@
 #include "illusions/illusions.h"
 #include "illusions/screentext.h"
 #include "illusions/dictionary.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "illusions/screen.h"
 #include "illusions/textdrawer.h"
 #include "engines/util.h"

engines/illusions/scriptopcodes_bbdou.cpp

@@ -26,12 +26,12 @@
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
+#include "illusions/resources/scriptresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/screen.h"
 #include "illusions/scriptstack.h"
-#include "illusions/scriptresource.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

@@ -26,12 +26,12 @@
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
+#include "illusions/resources/scriptresource.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/screen.h"
 #include "illusions/scriptstack.h"
-#include "illusions/scriptresource.h"
 #include "illusions/sound.h"
 #include "illusions/specialcode.h"
-#include "illusions/talkresource.h"
 #include "illusions/threads/scriptthread.h"
 
 namespace Illusions {

engines/illusions/sequenceopcodes.cpp

@@ -23,8 +23,8 @@
 #include "illusions/illusions.h"
 #include "illusions/sequenceopcodes.h"
 #include "illusions/actor.h"
-#include "illusions/actorresource.h"
 #include "illusions/dictionary.h"
+#include "illusions/resources/actorresource.h"
 #include "illusions/screen.h"
 #include "illusions/scriptopcodes.h"
 #include "illusions/sound.h"

engines/illusions/textdrawer.h

@@ -24,7 +24,7 @@
 #define ILLUSIONS_TEXTDRAWER_H
 
 #include "illusions/graphics.h"
-#include "illusions/fontresource.h"
+#include "illusions/resources/fontresource.h"
 #include "common/array.h"
 #include "common/rect.h"
 #include "graphics/surface.h"

engines/illusions/threads/talkthread.cpp

@@ -25,8 +25,8 @@
 #include "illusions/actor.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/sound.h"
-#include "illusions/talkresource.h"
 #include "illusions/time.h"
 
 namespace Illusions {

engines/illusions/threads/talkthread_duckman.cpp

@@ -25,9 +25,9 @@
 #include "illusions/actor.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
+#include "illusions/resources/talkresource.h"
 #include "illusions/screentext.h"
 #include "illusions/sound.h"
-#include "illusions/talkresource.h"
 #include "illusions/time.h"
 
 namespace Illusions {