diff options
29 files changed, 52 insertions, 52 deletions
diff --git a/engines/illusions/actor.h b/engines/illusions/actor.h index 5f95559fe6..c4ae052b12 100644 --- a/engines/illusions/actor.h +++ b/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" diff --git a/engines/illusions/camera.cpp b/engines/illusions/camera.cpp index 4e6281a9d8..ff774b67e7 100644 --- a/engines/illusions/camera.cpp +++ b/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 { diff --git a/engines/illusions/dictionary.cpp b/engines/illusions/dictionary.cpp index 5cf4cef652..d1b43ce12f 100644 --- a/engines/illusions/dictionary.cpp +++ b/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 { diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp index 93619a054a..4c8c7dc28f 100644 --- a/engines/illusions/illusions.cpp +++ b/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" diff --git a/engines/illusions/illusions_bbdou.cpp b/engines/illusions/illusions_bbdou.cpp index 3766c00fc0..31f8ab45f0 100644 --- a/engines/illusions/illusions_bbdou.cpp +++ b/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" diff --git a/engines/illusions/illusions_duckman.cpp b/engines/illusions/illusions_duckman.cpp index 50aea3dd7a..4d97343fc8 100644 --- a/engines/illusions/illusions_duckman.cpp +++ b/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" diff --git a/engines/illusions/module.mk b/engines/illusions/module.mk index 63e0210902..05cdb220e0 100644 --- a/engines/illusions/module.mk +++ b/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 diff --git a/engines/illusions/actorresource.cpp b/engines/illusions/resources/actorresource.cpp index 3cca9171ae..a8d62e5001 100644 --- a/engines/illusions/actorresource.cpp +++ b/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 { diff --git a/engines/illusions/actorresource.h b/engines/illusions/resources/actorresource.h index 2ccb9efd58..2ccb9efd58 100644 --- a/engines/illusions/actorresource.h +++ b/engines/illusions/resources/actorresource.h diff --git a/engines/illusions/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp index e8059bc4b6..bc87311186 100644 --- a/engines/illusions/backgroundresource.cpp +++ b/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" diff --git a/engines/illusions/backgroundresource.h b/engines/illusions/resources/backgroundresource.h index 9438501916..9438501916 100644 --- a/engines/illusions/backgroundresource.h +++ b/engines/illusions/resources/backgroundresource.h diff --git a/engines/illusions/fontresource.cpp b/engines/illusions/resources/fontresource.cpp index 91007fc89a..becc6cf58b 100644 --- a/engines/illusions/fontresource.cpp +++ b/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 { diff --git a/engines/illusions/fontresource.h b/engines/illusions/resources/fontresource.h index 8ea059fa37..8ea059fa37 100644 --- a/engines/illusions/fontresource.h +++ b/engines/illusions/resources/fontresource.h diff --git a/engines/illusions/midiresource.cpp b/engines/illusions/resources/midiresource.cpp index fc088ab020..a3aeef7798 100644 --- a/engines/illusions/midiresource.cpp +++ b/engines/illusions/resources/midiresource.cpp @@ -21,7 +21,7 @@ */ #include "illusions/illusions.h" -#include "illusions/midiresource.h" +#include "illusions/resources/midiresource.h" namespace Illusions { diff --git a/engines/illusions/midiresource.h b/engines/illusions/resources/midiresource.h index 9032e99396..9032e99396 100644 --- a/engines/illusions/midiresource.h +++ b/engines/illusions/resources/midiresource.h diff --git a/engines/illusions/scriptresource.cpp b/engines/illusions/resources/scriptresource.cpp index 775ca73b28..a29fd78253 100644 --- a/engines/illusions/scriptresource.cpp +++ b/engines/illusions/resources/scriptresource.cpp @@ -21,7 +21,7 @@ */ #include "illusions/illusions.h" -#include "illusions/scriptresource.h" +#include "illusions/resources/scriptresource.h" namespace Illusions { diff --git a/engines/illusions/scriptresource.h b/engines/illusions/resources/scriptresource.h index c2119b03c8..c2119b03c8 100644 --- a/engines/illusions/scriptresource.h +++ b/engines/illusions/resources/scriptresource.h diff --git a/engines/illusions/soundresource.cpp b/engines/illusions/resources/soundresource.cpp index efc16dfa69..35017e3cb1 100644 --- a/engines/illusions/soundresource.cpp +++ b/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 { diff --git a/engines/illusions/soundresource.h b/engines/illusions/resources/soundresource.h index 638e8df810..638e8df810 100644 --- a/engines/illusions/soundresource.h +++ b/engines/illusions/resources/soundresource.h diff --git a/engines/illusions/talkresource.cpp b/engines/illusions/resources/talkresource.cpp index 17672bae2a..57392c7f97 100644 --- a/engines/illusions/talkresource.cpp +++ b/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 { diff --git a/engines/illusions/talkresource.h b/engines/illusions/resources/talkresource.h index 5e3797e592..5e3797e592 100644 --- a/engines/illusions/talkresource.h +++ b/engines/illusions/resources/talkresource.h diff --git a/engines/illusions/screen.cpp b/engines/illusions/screen.cpp index 076906e3a0..9c603a8f8e 100644 --- a/engines/illusions/screen.cpp +++ b/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" diff --git a/engines/illusions/screentext.cpp b/engines/illusions/screentext.cpp index 37c52c0618..018decba36 100644 --- a/engines/illusions/screentext.cpp +++ b/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" diff --git a/engines/illusions/scriptopcodes_bbdou.cpp b/engines/illusions/scriptopcodes_bbdou.cpp index 03990c81a1..10c284d943 100644 --- a/engines/illusions/scriptopcodes_bbdou.cpp +++ b/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 { diff --git a/engines/illusions/scriptopcodes_duckman.cpp b/engines/illusions/scriptopcodes_duckman.cpp index 076a4008fb..0fb65ccfef 100644 --- a/engines/illusions/scriptopcodes_duckman.cpp +++ b/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 { diff --git a/engines/illusions/sequenceopcodes.cpp b/engines/illusions/sequenceopcodes.cpp index f2a0225ee1..fe08850732 100644 --- a/engines/illusions/sequenceopcodes.cpp +++ b/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" diff --git a/engines/illusions/textdrawer.h b/engines/illusions/textdrawer.h index a5f6102d28..290d6c7251 100644 --- a/engines/illusions/textdrawer.h +++ b/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" diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp index 3a4d286f66..54bc207a14 100644 --- a/engines/illusions/threads/talkthread.cpp +++ b/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 { diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp index 67c394cd75..84aa039c03 100644 --- a/engines/illusions/threads/talkthread_duckman.cpp +++ b/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 { |