diff options
-rw-r--r-- | engines/kyra/detection.cpp | 12 | ||||
-rw-r--r-- | engines/kyra/engine/chargen.cpp (renamed from engines/kyra/chargen.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/darkmoon.cpp (renamed from engines/kyra/darkmoon.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/darkmoon.h (renamed from engines/kyra/darkmoon.h) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/eob.cpp (renamed from engines/kyra/eob.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/eob.h (renamed from engines/kyra/eob.h) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/eobcommon.cpp (renamed from engines/kyra/eobcommon.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/engine/eobcommon.h (renamed from engines/kyra/eobcommon.h) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/item.h (renamed from engines/kyra/item.h) | 0 | ||||
-rw-r--r-- | engines/kyra/engine/items_eob.cpp (renamed from engines/kyra/items_eob.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/items_hof.cpp (renamed from engines/kyra/items_hof.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/items_lok.cpp (renamed from engines/kyra/items_lok.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/items_lol.cpp (renamed from engines/kyra/items_lol.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/items_mr.cpp (renamed from engines/kyra/items_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/items_v2.cpp (renamed from engines/kyra/items_v2.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_hof.cpp (renamed from engines/kyra/kyra_hof.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_hof.h (renamed from engines/kyra/kyra_hof.h) | 12 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_lok.cpp (renamed from engines/kyra/kyra_lok.cpp) | 16 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_lok.h (renamed from engines/kyra/kyra_lok.h) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_mr.cpp (renamed from engines/kyra/kyra_mr.cpp) | 18 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_mr.h (renamed from engines/kyra/kyra_mr.h) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_rpg.cpp (renamed from engines/kyra/kyra_rpg.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_rpg.h (renamed from engines/kyra/kyra_rpg.h) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_v1.cpp (renamed from engines/kyra/kyra_v1.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_v2.cpp (renamed from engines/kyra/kyra_v2.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/kyra_v2.h (renamed from engines/kyra/kyra_v2.h) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/lol.cpp (renamed from engines/kyra/lol.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/engine/lol.h (renamed from engines/kyra/lol.h) | 10 | ||||
-rw-r--r-- | engines/kyra/engine/magic_eob.cpp (renamed from engines/kyra/magic_eob.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/scene_eob.cpp (renamed from engines/kyra/scene_eob.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/engine/scene_hof.cpp (renamed from engines/kyra/scene_hof.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/scene_lok.cpp (renamed from engines/kyra/scene_lok.cpp) | 12 | ||||
-rw-r--r-- | engines/kyra/engine/scene_lol.cpp (renamed from engines/kyra/scene_lol.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/scene_mr.cpp (renamed from engines/kyra/scene_mr.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/scene_rpg.cpp (renamed from engines/kyra/scene_rpg.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/scene_v1.cpp (renamed from engines/kyra/scene_v1.cpp) | 0 | ||||
-rw-r--r-- | engines/kyra/engine/scene_v2.cpp (renamed from engines/kyra/scene_v2.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/sprites.cpp (renamed from engines/kyra/sprites.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/sprites.h (renamed from engines/kyra/sprites.h) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/sprites_eob.cpp (renamed from engines/kyra/sprites_eob.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/engine/sprites_lol.cpp (renamed from engines/kyra/sprites_lol.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/sprites_rpg.cpp (renamed from engines/kyra/sprites_rpg.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/timer.cpp (renamed from engines/kyra/timer.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/timer.h (renamed from engines/kyra/timer.h) | 0 | ||||
-rw-r--r-- | engines/kyra/engine/timer_eob.cpp (renamed from engines/kyra/timer_eob.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/timer_hof.cpp (renamed from engines/kyra/timer_hof.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/timer_lok.cpp (renamed from engines/kyra/timer_lok.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/engine/timer_lol.cpp (renamed from engines/kyra/timer_lol.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/timer_mr.cpp (renamed from engines/kyra/timer_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/timer_rpg.cpp (renamed from engines/kyra/timer_rpg.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/engine/util.cpp (renamed from engines/kyra/util.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/engine/util.h (renamed from engines/kyra/util.h) | 0 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_hof.cpp (renamed from engines/kyra/animator_hof.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_lok.cpp (renamed from engines/kyra/animator_lok.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_lok.h (renamed from engines/kyra/animator_lok.h) | 0 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_mr.cpp (renamed from engines/kyra/animator_mr.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_tim.cpp (renamed from engines/kyra/animator_tim.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/graphics/animator_v2.cpp (renamed from engines/kyra/animator_v2.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen.cpp (renamed from engines/kyra/screen.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen.h (renamed from engines/kyra/screen.h) | 0 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_eob.cpp (renamed from engines/kyra/screen_eob.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_eob.h (renamed from engines/kyra/screen_eob.h) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_hof.cpp (renamed from engines/kyra/screen_hof.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_hof.h (renamed from engines/kyra/screen_hof.h) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_lok.cpp (renamed from engines/kyra/screen_lok.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_lok.h (renamed from engines/kyra/screen_lok.h) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_lol.cpp (renamed from engines/kyra/screen_lol.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_lol.h (renamed from engines/kyra/screen_lol.h) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_mr.cpp (renamed from engines/kyra/screen_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_mr.h (renamed from engines/kyra/screen_mr.h) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_v2.cpp (renamed from engines/kyra/screen_v2.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/graphics/screen_v2.h (renamed from engines/kyra/screen_v2.h) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/vqa.cpp (renamed from engines/kyra/vqa.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/vqa.h (renamed from engines/kyra/vqa.h) | 0 | ||||
-rw-r--r-- | engines/kyra/graphics/wsamovie.cpp (renamed from engines/kyra/wsamovie.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/graphics/wsamovie.h (renamed from engines/kyra/wsamovie.h) | 0 | ||||
-rw-r--r-- | engines/kyra/gui/debugger.cpp (renamed from engines/kyra/debugger.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/gui/debugger.h (renamed from engines/kyra/debugger.h) | 0 | ||||
-rw-r--r-- | engines/kyra/gui/gui.cpp (renamed from engines/kyra/gui.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/gui/gui.h (renamed from engines/kyra/gui.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_eob.cpp (renamed from engines/kyra/gui_eob.cpp) | 12 | ||||
-rw-r--r-- | engines/kyra/gui/gui_eob.h (renamed from engines/kyra/gui_eob.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_hof.cpp (renamed from engines/kyra/gui_hof.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/gui/gui_hof.h (renamed from engines/kyra/gui_hof.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_lok.cpp (renamed from engines/kyra/gui_lok.cpp) | 12 | ||||
-rw-r--r-- | engines/kyra/gui/gui_lok.h (renamed from engines/kyra/gui_lok.h) | 4 | ||||
-rw-r--r-- | engines/kyra/gui/gui_lol.cpp (renamed from engines/kyra/gui_lol.cpp) | 12 | ||||
-rw-r--r-- | engines/kyra/gui/gui_lol.h (renamed from engines/kyra/gui_lol.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_mr.cpp (renamed from engines/kyra/gui_mr.cpp) | 12 | ||||
-rw-r--r-- | engines/kyra/gui/gui_mr.h (renamed from engines/kyra/gui_mr.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_rpg.cpp (renamed from engines/kyra/gui_rpg.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_v1.cpp (renamed from engines/kyra/gui_v1.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/gui/gui_v1.h (renamed from engines/kyra/gui_v1.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/gui_v2.cpp (renamed from engines/kyra/gui_v2.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/gui/gui_v2.h (renamed from engines/kyra/gui_v2.h) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/saveload.cpp (renamed from engines/kyra/saveload.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_eob.cpp (renamed from engines/kyra/saveload_eob.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_hof.cpp (renamed from engines/kyra/saveload_hof.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_lok.cpp (renamed from engines/kyra/saveload_lok.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_lol.cpp (renamed from engines/kyra/saveload_lol.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_mr.cpp (renamed from engines/kyra/saveload_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/gui/saveload_rpg.cpp (renamed from engines/kyra/saveload_rpg.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 4 | ||||
-rw-r--r-- | engines/kyra/module.mk | 216 | ||||
-rw-r--r-- | engines/kyra/resource/resource.cpp (renamed from engines/kyra/resource.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/resource/resource.h (renamed from engines/kyra/resource.h) | 6 | ||||
-rw-r--r-- | engines/kyra/resource/resource_intern.cpp (renamed from engines/kyra/resource_intern.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/resource/resource_intern.h (renamed from engines/kyra/resource_intern.h) | 0 | ||||
-rw-r--r-- | engines/kyra/resource/staticres.cpp (renamed from engines/kyra/staticres.cpp) | 26 | ||||
-rw-r--r-- | engines/kyra/resource/staticres_eob.cpp (renamed from engines/kyra/staticres_eob.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/resource/staticres_lol.cpp (renamed from engines/kyra/staticres_lol.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/resource/staticres_rpg.cpp (renamed from engines/kyra/staticres_rpg.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/script/script.cpp (renamed from engines/kyra/script.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/script/script.h (renamed from engines/kyra/script.h) | 0 | ||||
-rw-r--r-- | engines/kyra/script/script_eob.cpp (renamed from engines/kyra/script_eob.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/script/script_eob.h (renamed from engines/kyra/script_eob.h) | 0 | ||||
-rw-r--r-- | engines/kyra/script/script_hof.cpp (renamed from engines/kyra/script_hof.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/script/script_lok.cpp (renamed from engines/kyra/script_lok.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/script/script_lol.cpp (renamed from engines/kyra/script_lol.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/script/script_mr.cpp (renamed from engines/kyra/script_mr.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/script/script_tim.cpp (renamed from engines/kyra/script_tim.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/script/script_tim.h (renamed from engines/kyra/script_tim.h) | 0 | ||||
-rw-r--r-- | engines/kyra/script/script_v1.cpp (renamed from engines/kyra/script_v1.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/script/script_v2.cpp (renamed from engines/kyra/script_v2.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/sequence/seqplayer.cpp (renamed from engines/kyra/seqplayer.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/sequence/seqplayer.h (renamed from engines/kyra/seqplayer.h) | 2 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_darkmoon.cpp (renamed from engines/kyra/sequences_darkmoon.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_eob.cpp (renamed from engines/kyra/sequences_eob.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_hof.cpp (renamed from engines/kyra/sequences_hof.cpp) | 14 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_hof.h (renamed from engines/kyra/sequences_hof.h) | 2 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_lok.cpp (renamed from engines/kyra/sequences_lok.cpp) | 16 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_lol.cpp (renamed from engines/kyra/sequences_lol.cpp) | 8 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_mr.cpp (renamed from engines/kyra/sequences_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sequence/sequences_v2.cpp (renamed from engines/kyra/sequences_v2.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound.cpp (renamed from engines/kyra/sound.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound.h (renamed from engines/kyra/sound.h) | 0 | ||||
-rw-r--r-- | engines/kyra/sound/sound_adlib.cpp (renamed from engines/kyra/sound_adlib.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_adlib.h (renamed from engines/kyra/sound_adlib.h) | 2 | ||||
-rw-r--r-- | engines/kyra/sound/sound_amiga.cpp (renamed from engines/kyra/sound_amiga.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_digital.cpp (renamed from engines/kyra/sound_digital.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/sound/sound_digital.h (renamed from engines/kyra/sound_digital.h) | 0 | ||||
-rw-r--r-- | engines/kyra/sound/sound_intern.h (renamed from engines/kyra/sound_intern.h) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_lok.cpp (renamed from engines/kyra/sound_lok.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_lol.cpp (renamed from engines/kyra/sound_lol.cpp) | 6 | ||||
-rw-r--r-- | engines/kyra/sound/sound_midi.cpp (renamed from engines/kyra/sound_midi.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_pcspk.cpp (renamed from engines/kyra/sound_pcspk.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/sound/sound_towns.cpp (renamed from engines/kyra/sound_towns.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/sound/sound_towns_darkmoon.cpp (renamed from engines/kyra/sound_towns_darkmoon.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/text/text.cpp (renamed from engines/kyra/text.cpp) | 2 | ||||
-rw-r--r-- | engines/kyra/text/text.h (renamed from engines/kyra/text.h) | 2 | ||||
-rw-r--r-- | engines/kyra/text/text_hof.cpp (renamed from engines/kyra/text_hof.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/text/text_hof.h (renamed from engines/kyra/text_hof.h) | 2 | ||||
-rw-r--r-- | engines/kyra/text/text_lok.cpp (renamed from engines/kyra/text_lok.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/text/text_lol.cpp (renamed from engines/kyra/text_lol.cpp) | 10 | ||||
-rw-r--r-- | engines/kyra/text/text_lol.h (renamed from engines/kyra/text_lol.h) | 2 | ||||
-rw-r--r-- | engines/kyra/text/text_mr.cpp (renamed from engines/kyra/text_mr.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/text/text_mr.h (renamed from engines/kyra/text_mr.h) | 4 | ||||
-rw-r--r-- | engines/kyra/text/text_rpg.cpp (renamed from engines/kyra/text_rpg.cpp) | 4 | ||||
-rw-r--r-- | engines/kyra/text/text_rpg.h (renamed from engines/kyra/text_rpg.h) | 0 |
159 files changed, 526 insertions, 526 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 0c345cc52a..a26c52ac12 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -20,12 +20,12 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/lol.h" -#include "kyra/kyra_hof.h" -#include "kyra/kyra_mr.h" -#include "kyra/eob.h" -#include "kyra/darkmoon.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/engine/lol.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/engine/eob.h" +#include "kyra/engine/darkmoon.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/kyra/chargen.cpp b/engines/kyra/engine/chargen.cpp index 4724770782..c080acc130 100644 --- a/engines/kyra/chargen.cpp +++ b/engines/kyra/engine/chargen.cpp @@ -22,9 +22,9 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/resource.h" -#include "kyra/sound_intern.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound_intern.h" #include "common/savefile.h" #include "common/str-array.h" diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/engine/darkmoon.cpp index 12508546a0..9731f00533 100644 --- a/engines/kyra/darkmoon.cpp +++ b/engines/kyra/engine/darkmoon.cpp @@ -22,9 +22,9 @@ #ifdef ENABLE_EOB -#include "kyra/darkmoon.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/darkmoon.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" namespace Kyra { diff --git a/engines/kyra/darkmoon.h b/engines/kyra/engine/darkmoon.h index f7065da8d6..3577bdbcec 100644 --- a/engines/kyra/darkmoon.h +++ b/engines/kyra/engine/darkmoon.h @@ -25,7 +25,7 @@ #ifndef KYRA_EOB2_H #define KYRA_EOB2_H -#include "kyra/eobcommon.h" +#include "kyra/engine/eobcommon.h" namespace Kyra { diff --git a/engines/kyra/eob.cpp b/engines/kyra/engine/eob.cpp index 6a6b20baac..18ed9c623a 100644 --- a/engines/kyra/eob.cpp +++ b/engines/kyra/engine/eob.cpp @@ -22,9 +22,9 @@ #ifdef ENABLE_EOB -#include "kyra/eob.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/eob.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" namespace Kyra { diff --git a/engines/kyra/eob.h b/engines/kyra/engine/eob.h index 889144b705..0eb8fd3a64 100644 --- a/engines/kyra/eob.h +++ b/engines/kyra/engine/eob.h @@ -25,7 +25,7 @@ #ifndef KYRA_EOB1_H #define KYRA_EOB1_H -#include "kyra/eobcommon.h" +#include "kyra/engine/eobcommon.h" namespace Kyra { diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp index 9f7715b37f..58cc394abd 100644 --- a/engines/kyra/eobcommon.cpp +++ b/engines/kyra/engine/eobcommon.cpp @@ -22,13 +22,13 @@ #ifdef ENABLE_EOB -#include "kyra/kyra_rpg.h" -#include "kyra/resource.h" -#include "engines/kyra/sound_intern.h" -#include "engines/kyra/sound_adlib.h" -#include "kyra/script_eob.h" -#include "kyra/timer.h" -#include "kyra/debugger.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/sound/sound_adlib.h" +#include "kyra/script/script_eob.h" +#include "kyra/engine/timer.h" +#include "kyra/gui/debugger.h" #include "common/config-manager.h" #include "common/translation.h" diff --git a/engines/kyra/eobcommon.h b/engines/kyra/engine/eobcommon.h index 02627bf111..9e0fdf08b7 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/engine/eobcommon.h @@ -24,7 +24,7 @@ #define KYRA_EOBCOMMON_H #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" +#include "kyra/engine/kyra_rpg.h" #endif // (ENABLE_EOB || ENABLE_LOL) #ifdef ENABLE_EOB diff --git a/engines/kyra/item.h b/engines/kyra/engine/item.h index cf06aad8ba..cf06aad8ba 100644 --- a/engines/kyra/item.h +++ b/engines/kyra/engine/item.h diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/engine/items_eob.cpp index 036ee818f8..54d3d5090b 100644 --- a/engines/kyra/items_eob.cpp +++ b/engines/kyra/engine/items_eob.cpp @@ -22,9 +22,9 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" namespace Kyra { diff --git a/engines/kyra/items_hof.cpp b/engines/kyra/engine/items_hof.cpp index 2640af5188..dd53882cb9 100644 --- a/engines/kyra/items_hof.cpp +++ b/engines/kyra/engine/items_hof.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/kyra_hof.h" +#include "kyra/engine/kyra_hof.h" #include "common/system.h" diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/engine/items_lok.cpp index 3a2e631744..5927ba0060 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/engine/items_lok.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/animator_lok.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/animator_lok.h" #include "common/system.h" diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/engine/items_lol.cpp index e1f864ddd2..446650d6e1 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/engine/items_lol.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" namespace Kyra { diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/engine/items_mr.cpp index 397fab8d8f..3963934ffb 100644 --- a/engines/kyra/items_mr.cpp +++ b/engines/kyra/engine/items_mr.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/items_v2.cpp b/engines/kyra/engine/items_v2.cpp index 732fa7c8dd..93afff62aa 100644 --- a/engines/kyra/items_v2.cpp +++ b/engines/kyra/engine/items_v2.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_v2.h" -#include "kyra/screen_v2.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/graphics/screen_v2.h" namespace Kyra { diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/engine/kyra_hof.cpp index 9988899da8..94eca126ec 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/engine/kyra_hof.cpp @@ -20,13 +20,13 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/resource.h" -#include "kyra/text_hof.h" -#include "kyra/timer.h" -#include "kyra/debugger.h" -#include "kyra/util.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/resource/resource.h" +#include "kyra/text/text_hof.h" +#include "kyra/engine/timer.h" +#include "kyra/gui/debugger.h" +#include "kyra/engine/util.h" +#include "kyra/sound/sound.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/engine/kyra_hof.h index 1e500d4286..588efbb5ab 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/engine/kyra_hof.h @@ -23,12 +23,12 @@ #ifndef KYRA_KYRA_HOF_H #define KYRA_KYRA_HOF_H -#include "kyra/kyra_v2.h" -#include "kyra/script.h" -#include "kyra/script_tim.h" -#include "kyra/screen_hof.h" -#include "kyra/text_hof.h" -#include "kyra/gui_hof.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/script/script.h" +#include "kyra/script/script_tim.h" +#include "kyra/graphics/screen_hof.h" +#include "kyra/text/text_hof.h" +#include "kyra/gui/gui_hof.h" #include "common/list.h" #include "common/func.h" diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/engine/kyra_lok.cpp index 118ca8dfaa..30a83b2440 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/engine/kyra_lok.cpp @@ -20,14 +20,14 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/resource.h" -#include "kyra/seqplayer.h" -#include "kyra/sprites.h" -#include "kyra/animator_lok.h" -#include "kyra/debugger.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/resource/resource.h" +#include "kyra/sequence/seqplayer.h" +#include "kyra/engine/sprites.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/gui/debugger.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/engine/kyra_lok.h index a10b208389..05053877c4 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/engine/kyra_lok.h @@ -24,10 +24,10 @@ #define KYRA_KYRA_LOK_H #include "kyra/kyra_v1.h" -#include "kyra/script.h" -#include "kyra/screen_lok.h" -#include "kyra/gui_lok.h" -#include "kyra/item.h" +#include "kyra/script/script.h" +#include "kyra/graphics/screen_lok.h" +#include "kyra/gui/gui_lok.h" +#include "kyra/engine/item.h" namespace Kyra { diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/engine/kyra_mr.cpp index 834bda9454..9cadf3c626 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/engine/kyra_mr.cpp @@ -20,15 +20,15 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/wsamovie.h" -#include "kyra/text_mr.h" -#include "kyra/vqa.h" -#include "kyra/timer.h" -#include "kyra/debugger.h" -#include "kyra/gui_mr.h" -#include "kyra/resource.h" -#include "kyra/sound_digital.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/text/text_mr.h" +#include "kyra/graphics/vqa.h" +#include "kyra/engine/timer.h" +#include "kyra/gui/debugger.h" +#include "kyra/gui/gui_mr.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound_digital.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/engine/kyra_mr.h index 787dd4c936..83c97ebad9 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/engine/kyra_mr.h @@ -23,10 +23,10 @@ #ifndef KYRA_KYRA_MR_H #define KYRA_KYRA_MR_H -#include "kyra/kyra_v2.h" -#include "kyra/screen_mr.h" -#include "kyra/script.h" -#include "kyra/gui_mr.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/graphics/screen_mr.h" +#include "kyra/script/script.h" +#include "kyra/gui/gui_mr.h" #include "common/hashmap.h" #include "common/list.h" diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/engine/kyra_rpg.cpp index 75cb6f5945..3d7a4df208 100644 --- a/engines/kyra/kyra_rpg.cpp +++ b/engines/kyra/engine/kyra_rpg.cpp @@ -22,8 +22,8 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/engine/kyra_rpg.h index 3d673824f9..a446c87a0e 100644 --- a/engines/kyra/kyra_rpg.h +++ b/engines/kyra/engine/kyra_rpg.h @@ -26,9 +26,9 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) #include "kyra/kyra_v1.h" -#include "kyra/screen_eob.h" -#include "kyra/gui_eob.h" -#include "kyra/text_lol.h" +#include "kyra/graphics/screen_eob.h" +#include "kyra/gui/gui_eob.h" +#include "kyra/text/text_lol.h" namespace Kyra { diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp index 83fe5192aa..e2896eb1a5 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/engine/kyra_v1.cpp @@ -21,10 +21,10 @@ */ #include "kyra/kyra_v1.h" -#include "kyra/sound_intern.h" -#include "kyra/resource.h" -#include "kyra/timer.h" -#include "kyra/debugger.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" +#include "kyra/gui/debugger.h" #include "common/error.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/engine/kyra_v2.cpp index 106420d9c2..e606a66c15 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/engine/kyra_v2.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_v2.h" -#include "kyra/screen_v2.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/graphics/screen_v2.h" #include "common/config-manager.h" #include "common/error.h" diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/engine/kyra_v2.h index f00c4635b5..87de4398e1 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/engine/kyra_v2.h @@ -24,9 +24,9 @@ #define KYRA_KYRA_V2_H #include "kyra/kyra_v1.h" -#include "kyra/gui_v1.h" -#include "kyra/wsamovie.h" -#include "kyra/item.h" +#include "kyra/gui/gui_v1.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/engine/item.h" #include "common/list.h" #include "common/hashmap.h" diff --git a/engines/kyra/lol.cpp b/engines/kyra/engine/lol.cpp index 5500e8b95f..9cf045a876 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/engine/lol.cpp @@ -22,13 +22,13 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/resource.h" -#include "kyra/timer.h" -#include "kyra/util.h" -#include "kyra/debugger.h" -#include "kyra/sound.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" +#include "kyra/engine/util.h" +#include "kyra/gui/debugger.h" +#include "kyra/sound/sound.h" #include "audio/audiostream.h" diff --git a/engines/kyra/lol.h b/engines/kyra/engine/lol.h index 5d9804ea4c..14811d21f1 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/engine/lol.h @@ -25,11 +25,11 @@ #ifndef KYRA_LOL_H #define KYRA_LOL_H -#include "kyra/kyra_rpg.h" -#include "kyra/script_tim.h" -#include "kyra/script.h" -#include "kyra/gui_lol.h" -#include "kyra/text_lol.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/script/script_tim.h" +#include "kyra/script/script.h" +#include "kyra/gui/gui_lol.h" +#include "kyra/text/text_lol.h" #include "common/list.h" diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/engine/magic_eob.cpp index 91d50c6279..d443b85c18 100644 --- a/engines/kyra/magic_eob.cpp +++ b/engines/kyra/engine/magic_eob.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/resource.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/resource/resource.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/engine/scene_eob.cpp index c19f102e03..3ff26cab8a 100644 --- a/engines/kyra/scene_eob.cpp +++ b/engines/kyra/engine/scene_eob.cpp @@ -22,11 +22,11 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/resource.h" -#include "kyra/script_eob.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/resource/resource.h" +#include "kyra/script/script_eob.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/engine/scene_hof.cpp index 8ec14e4ac7..e4747fd7d5 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/engine/scene_hof.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/sound.h" -#include "kyra/resource.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/sound/sound.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/engine/scene_lok.cpp index df9b11d5a2..51348c5392 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/engine/scene_lok.cpp @@ -20,12 +20,12 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/resource.h" -#include "kyra/sound.h" -#include "kyra/sprites.h" -#include "kyra/animator_lok.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" +#include "kyra/engine/sprites.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/engine/scene_lol.cpp index c1579c3501..93ff588ece 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/engine/scene_lol.cpp @@ -22,10 +22,10 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/resource.h" -#include "kyra/timer.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" #include "common/endian.h" #include "common/system.h" diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/engine/scene_mr.cpp index 38ee25f54a..8935863542 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/engine/scene_mr.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/screen_mr.h" -#include "kyra/sound_digital.h" -#include "kyra/resource.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/graphics/screen_mr.h" +#include "kyra/sound/sound_digital.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/engine/scene_rpg.cpp index 756f694a36..72922d4b53 100644 --- a/engines/kyra/scene_rpg.cpp +++ b/engines/kyra/engine/scene_rpg.cpp @@ -22,10 +22,10 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" -#include "kyra/resource.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/engine/scene_v1.cpp index 48958e5b90..48958e5b90 100644 --- a/engines/kyra/scene_v1.cpp +++ b/engines/kyra/engine/scene_v1.cpp diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/engine/scene_v2.cpp index e4258836bc..dad8188542 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/engine/scene_v2.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/kyra_v2.h" +#include "kyra/engine/kyra_v2.h" #include "common/system.h" diff --git a/engines/kyra/sprites.cpp b/engines/kyra/engine/sprites.cpp index 540191e678..197d8eab4e 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/engine/sprites.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/sprites.h" -#include "kyra/resource.h" -#include "kyra/animator_lok.h" +#include "kyra/engine/sprites.h" +#include "kyra/resource/resource.h" +#include "kyra/graphics/animator_lok.h" #include "common/system.h" diff --git a/engines/kyra/sprites.h b/engines/kyra/engine/sprites.h index 3319948707..f68f36ffa4 100644 --- a/engines/kyra/sprites.h +++ b/engines/kyra/engine/sprites.h @@ -23,7 +23,7 @@ #ifndef KYRA_SPRITES_H #define KYRA_SPRITES_H -#include "kyra/kyra_lok.h" +#include "kyra/engine/kyra_lok.h" #include "common/random.h" namespace Kyra { diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/engine/sprites_eob.cpp index 077eafa97b..d7bfe7413d 100644 --- a/engines/kyra/sprites_eob.cpp +++ b/engines/kyra/engine/sprites_eob.cpp @@ -22,10 +22,10 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/script_eob.h" -#include "kyra/resource.h" -#include "kyra/timer.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/script/script_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/engine/sprites_lol.cpp index b9ffe6cbdb..910447c45a 100644 --- a/engines/kyra/sprites_lol.cpp +++ b/engines/kyra/engine/sprites_lol.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" namespace Kyra { diff --git a/engines/kyra/sprites_rpg.cpp b/engines/kyra/engine/sprites_rpg.cpp index b190ad8f07..87c2513c09 100644 --- a/engines/kyra/sprites_rpg.cpp +++ b/engines/kyra/engine/sprites_rpg.cpp @@ -22,7 +22,7 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" +#include "kyra/engine/kyra_rpg.h" namespace Kyra { diff --git a/engines/kyra/timer.cpp b/engines/kyra/engine/timer.cpp index 97e989ea38..9728838015 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/engine/timer.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/timer.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/timer.h b/engines/kyra/engine/timer.h index a753707b8a..a753707b8a 100644 --- a/engines/kyra/timer.h +++ b/engines/kyra/engine/timer.h diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/engine/timer_eob.cpp index c5290790e7..8cac8d8abc 100644 --- a/engines/kyra/timer_eob.cpp +++ b/engines/kyra/engine/timer_eob.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/eobcommon.h" -#include "kyra/timer.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/timer_hof.cpp b/engines/kyra/engine/timer_hof.cpp index bdfb93eebb..1973e2e593 100644 --- a/engines/kyra/timer_hof.cpp +++ b/engines/kyra/engine/timer_hof.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/timer.h" namespace Kyra { diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/engine/timer_lok.cpp index b046e92988..47f8d0c80b 100644 --- a/engines/kyra/timer_lok.cpp +++ b/engines/kyra/engine/timer_lok.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/animator_lok.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/engine/timer.h" namespace Kyra { diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/engine/timer_lol.cpp index 1326eea754..8ece68afa4 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/engine/timer_lol.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/timer.h" +#include "kyra/engine/lol.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/timer_mr.cpp b/engines/kyra/engine/timer_mr.cpp index 58c75ac980..544e36afa9 100644 --- a/engines/kyra/timer_mr.cpp +++ b/engines/kyra/engine/timer_mr.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/timer_rpg.cpp b/engines/kyra/engine/timer_rpg.cpp index b31c406480..572829eb64 100644 --- a/engines/kyra/timer_rpg.cpp +++ b/engines/kyra/engine/timer_rpg.cpp @@ -22,8 +22,8 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/util.cpp b/engines/kyra/engine/util.cpp index 325f29ebd7..ae5b833858 100644 --- a/engines/kyra/util.cpp +++ b/engines/kyra/engine/util.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/util.h" +#include "kyra/engine/util.h" namespace Kyra { diff --git a/engines/kyra/util.h b/engines/kyra/engine/util.h index 130768f89d..130768f89d 100644 --- a/engines/kyra/util.h +++ b/engines/kyra/engine/util.h diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/graphics/animator_hof.cpp index 7ce79cb7a0..0b8db62a9b 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/graphics/animator_hof.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/wsamovie.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/graphics/wsamovie.h" #include "common/system.h" diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/graphics/animator_lok.cpp index ba6dc91e1f..9f4236b32b 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/graphics/animator_lok.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/screen.h" -#include "kyra/animator_lok.h" -#include "kyra/sprites.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/screen.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/engine/sprites.h" namespace Kyra { diff --git a/engines/kyra/animator_lok.h b/engines/kyra/graphics/animator_lok.h index 55c4d571fd..55c4d571fd 100644 --- a/engines/kyra/animator_lok.h +++ b/engines/kyra/graphics/animator_lok.h diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/graphics/animator_mr.cpp index 3b9454ce56..11b1bcb45a 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/graphics/animator_mr.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/resource.h" -#include "kyra/wsamovie.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/resource/resource.h" +#include "kyra/graphics/wsamovie.h" #include "common/system.h" diff --git a/engines/kyra/animator_tim.cpp b/engines/kyra/graphics/animator_tim.cpp index b1cfc6a6a8..160524e6ca 100644 --- a/engines/kyra/animator_tim.cpp +++ b/engines/kyra/graphics/animator_tim.cpp @@ -20,14 +20,14 @@ * */ -#include "kyra/script_tim.h" -#include "kyra/wsamovie.h" -#include "kyra/screen_lol.h" +#include "kyra/script/script_tim.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/graphics/screen_lol.h" #ifdef ENABLE_LOL -#include "kyra/lol.h" +#include "kyra/engine/lol.h" #else -#include "kyra/screen_v2.h" +#include "kyra/graphics/screen_v2.h" #endif #include "common/system.h" diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/graphics/animator_v2.cpp index 5ac154bdce..a7a8d70962 100644 --- a/engines/kyra/animator_v2.cpp +++ b/engines/kyra/graphics/animator_v2.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_v2.h" -#include "kyra/screen_v2.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/graphics/screen_v2.h" namespace Kyra { diff --git a/engines/kyra/screen.cpp b/engines/kyra/graphics/screen.cpp index eb9ba016bd..a07e437d5f 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/graphics/screen.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" #include "kyra/kyra_v1.h" -#include "kyra/resource.h" +#include "kyra/resource/resource.h" #include "common/endian.h" #include "common/memstream.h" diff --git a/engines/kyra/screen.h b/engines/kyra/graphics/screen.h index 44113e4372..44113e4372 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/graphics/screen.h diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp index 4eae318753..3945c034fc 100644 --- a/engines/kyra/screen_eob.cpp +++ b/engines/kyra/graphics/screen_eob.cpp @@ -22,13 +22,13 @@ #if !defined(ENABLE_EOB) -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" #endif #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/resource.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/screen_eob.h b/engines/kyra/graphics/screen_eob.h index f5bd9874d8..401a229045 100644 --- a/engines/kyra/screen_eob.h +++ b/engines/kyra/graphics/screen_eob.h @@ -25,7 +25,7 @@ #ifdef ENABLE_EOB -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" namespace Kyra { diff --git a/engines/kyra/screen_hof.cpp b/engines/kyra/graphics/screen_hof.cpp index a80d91381c..a3ab811cdb 100644 --- a/engines/kyra/screen_hof.cpp +++ b/engines/kyra/graphics/screen_hof.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/screen_hof.h" -#include "kyra/kyra_hof.h" +#include "kyra/graphics/screen_hof.h" +#include "kyra/engine/kyra_hof.h" namespace Kyra { diff --git a/engines/kyra/screen_hof.h b/engines/kyra/graphics/screen_hof.h index 1ad2b3c93d..5cb189e0ef 100644 --- a/engines/kyra/screen_hof.h +++ b/engines/kyra/graphics/screen_hof.h @@ -23,7 +23,7 @@ #ifndef KYRA_SCREEN_HOF_H #define KYRA_SCREEN_HOF_H -#include "kyra/screen_v2.h" +#include "kyra/graphics/screen_v2.h" namespace Kyra { diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/graphics/screen_lok.cpp index 57601104ad..114382b487 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/graphics/screen_lok.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/screen_lok.h" -#include "kyra/kyra_lok.h" +#include "kyra/graphics/screen_lok.h" +#include "kyra/engine/kyra_lok.h" #include "common/system.h" diff --git a/engines/kyra/screen_lok.h b/engines/kyra/graphics/screen_lok.h index 8f36ce7fb0..3a4ebfd6a4 100644 --- a/engines/kyra/screen_lok.h +++ b/engines/kyra/graphics/screen_lok.h @@ -23,7 +23,7 @@ #ifndef KYRA_SCREEN_LOK_H #define KYRA_SCREEN_LOK_H -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" namespace Kyra { diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/graphics/screen_lol.cpp index 2531cb4cb1..b42565fc9d 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/graphics/screen_lol.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_LOL -#include "kyra/screen_lol.h" -#include "kyra/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/engine/lol.h" #include "common/system.h" diff --git a/engines/kyra/screen_lol.h b/engines/kyra/graphics/screen_lol.h index 49c6f90168..ef14c52463 100644 --- a/engines/kyra/screen_lol.h +++ b/engines/kyra/graphics/screen_lol.h @@ -25,7 +25,7 @@ #ifndef KYRA_SCREEN_LOL_H #define KYRA_SCREEN_LOL_H -#include "kyra/screen_v2.h" +#include "kyra/graphics/screen_v2.h" namespace Kyra { diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/graphics/screen_mr.cpp index fa820a79eb..acb99fe0b0 100644 --- a/engines/kyra/screen_mr.cpp +++ b/engines/kyra/graphics/screen_mr.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/screen_mr.h" -#include "kyra/kyra_mr.h" +#include "kyra/graphics/screen_mr.h" +#include "kyra/engine/kyra_mr.h" namespace Kyra { diff --git a/engines/kyra/screen_mr.h b/engines/kyra/graphics/screen_mr.h index ef982d4bcd..fcbef380c7 100644 --- a/engines/kyra/screen_mr.h +++ b/engines/kyra/graphics/screen_mr.h @@ -23,7 +23,7 @@ #ifndef KYRA_SCREEN_MR_H #define KYRA_SCREEN_MR_H -#include "kyra/screen_v2.h" +#include "kyra/graphics/screen_v2.h" namespace Kyra { diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/graphics/screen_v2.cpp index eabcdb2393..cb9fbca1b7 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/graphics/screen_v2.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/screen_v2.h" +#include "kyra/graphics/screen_v2.h" #include "common/endian.h" diff --git a/engines/kyra/screen_v2.h b/engines/kyra/graphics/screen_v2.h index 06f7aa2d4a..9c8aa12563 100644 --- a/engines/kyra/screen_v2.h +++ b/engines/kyra/graphics/screen_v2.h @@ -23,8 +23,8 @@ #ifndef KYRA_SCREEN_V2_H #define KYRA_SCREEN_V2_H -#include "kyra/screen.h" -#include "kyra/kyra_v2.h" +#include "kyra/graphics/screen.h" +#include "kyra/engine/kyra_v2.h" namespace Kyra { diff --git a/engines/kyra/vqa.cpp b/engines/kyra/graphics/vqa.cpp index 0ccf7ebe33..5a4e250b42 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/graphics/vqa.cpp @@ -29,8 +29,8 @@ // The jung2.vqa movie does work, but only thanks to a grotesque hack. #include "kyra/kyra_v1.h" -#include "kyra/vqa.h" -#include "kyra/screen.h" +#include "kyra/graphics/vqa.h" +#include "kyra/graphics/screen.h" #include "audio/audiostream.h" #include "audio/decoders/raw.h" diff --git a/engines/kyra/vqa.h b/engines/kyra/graphics/vqa.h index df51a81988..df51a81988 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/graphics/vqa.h diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/graphics/wsamovie.cpp index 560ac8c332..6cbda7b6c9 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/graphics/wsamovie.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/wsamovie.h" -#include "kyra/resource.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/resource/resource.h" #include "common/endian.h" diff --git a/engines/kyra/wsamovie.h b/engines/kyra/graphics/wsamovie.h index d00aa89af1..d00aa89af1 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/graphics/wsamovie.h diff --git a/engines/kyra/debugger.cpp b/engines/kyra/gui/debugger.cpp index d87106c839..f8fa7f8502 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/gui/debugger.cpp @@ -20,13 +20,13 @@ * */ -#include "kyra/debugger.h" -#include "kyra/kyra_lok.h" -#include "kyra/kyra_hof.h" -#include "kyra/timer.h" -#include "kyra/resource.h" -#include "kyra/lol.h" -#include "kyra/eobcommon.h" +#include "kyra/gui/debugger.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/timer.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/lol.h" +#include "kyra/engine/eobcommon.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/debugger.h b/engines/kyra/gui/debugger.h index 86df8ec1e6..86df8ec1e6 100644 --- a/engines/kyra/debugger.h +++ b/engines/kyra/gui/debugger.h diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui/gui.cpp index d9c2f9183d..dfceee86ea 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui/gui.cpp @@ -21,9 +21,9 @@ */ -#include "kyra/gui.h" +#include "kyra/gui/gui.h" #include "kyra/kyra_v1.h" -#include "kyra/util.h" +#include "kyra/engine/util.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui.h b/engines/kyra/gui/gui.h index 3e2bdc04cd..7b708c7436 100644 --- a/engines/kyra/gui.h +++ b/engines/kyra/gui/gui.h @@ -24,7 +24,7 @@ #define KYRA_GUI_H #include "kyra/kyra_v1.h" -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" #include "common/ptr.h" #include "common/array.h" diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui/gui_eob.cpp index c942f67577..761524177e 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui/gui_eob.cpp @@ -22,12 +22,12 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/gui_eob.h" -#include "kyra/script_eob.h" -#include "kyra/text_rpg.h" -#include "kyra/timer.h" -#include "kyra/util.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/gui/gui_eob.h" +#include "kyra/script/script_eob.h" +#include "kyra/text/text_rpg.h" +#include "kyra/engine/timer.h" +#include "kyra/engine/util.h" #include "backends/keymapper/keymapper.h" #include "common/system.h" diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui/gui_eob.h index 5d2fed4dbc..eadb7b0801 100644 --- a/engines/kyra/gui_eob.h +++ b/engines/kyra/gui/gui_eob.h @@ -25,7 +25,7 @@ #ifndef KYRA_GUI_EOB_H #define KYRA_GUI_EOB_H -#include "kyra/gui.h" +#include "kyra/gui/gui.h" #ifdef ENABLE_EOB diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui/gui_hof.cpp index 8515cf51e0..0b5d7eac85 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui/gui_hof.cpp @@ -20,11 +20,11 @@ * */ -#include "kyra/gui_hof.h" -#include "kyra/kyra_hof.h" -#include "kyra/timer.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/gui/gui_hof.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/timer.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/gui_hof.h b/engines/kyra/gui/gui_hof.h index 9f6aaae2ca..1ff91e4ecb 100644 --- a/engines/kyra/gui_hof.h +++ b/engines/kyra/gui/gui_hof.h @@ -23,7 +23,7 @@ #ifndef KYRA_GUI_HOF_H #define KYRA_GUI_HOF_H -#include "kyra/gui_v2.h" +#include "kyra/gui/gui_v2.h" namespace Kyra { diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui/gui_lok.cpp index 03b77bf677..188e992f8d 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui/gui_lok.cpp @@ -20,12 +20,12 @@ * */ -#include "kyra/gui_lok.h" -#include "kyra/kyra_lok.h" -#include "kyra/animator_lok.h" -#include "kyra/text.h" -#include "kyra/timer.h" -#include "kyra/util.h" +#include "kyra/gui/gui_lok.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/text/text.h" +#include "kyra/engine/timer.h" +#include "kyra/engine/util.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui/gui_lok.h index 76a5dc586b..fe0a5a7b43 100644 --- a/engines/kyra/gui_lok.h +++ b/engines/kyra/gui/gui_lok.h @@ -23,8 +23,8 @@ #ifndef KYRA_GUI_LOK_H #define KYRA_GUI_LOK_H -#include "kyra/gui_v1.h" -#include "kyra/screen_lok.h" +#include "kyra/gui/gui_v1.h" +#include "kyra/graphics/screen_lok.h" namespace Kyra { diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp index 5ff0b6a109..0c21227b19 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui/gui_lol.cpp @@ -22,12 +22,12 @@ #ifdef ENABLE_LOL -#include "kyra/gui_lol.h" -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/resource.h" -#include "kyra/util.h" -#include "kyra/sound.h" +#include "kyra/gui/gui_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/util.h" +#include "kyra/sound/sound.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui/gui_lol.h index 6fa6571016..9bad5b1196 100644 --- a/engines/kyra/gui_lol.h +++ b/engines/kyra/gui/gui_lol.h @@ -25,7 +25,7 @@ #ifndef KYRA_GUI_LOL_H #define KYRA_GUI_LOL_H -#include "kyra/gui_v1.h" +#include "kyra/gui/gui_v1.h" namespace Kyra { #define GUI_LOL_MENU(menu, a, b, c, d, e, f, g, i) \ diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui/gui_mr.cpp index 7984dde662..dc335f1126 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui/gui_mr.cpp @@ -20,12 +20,12 @@ * */ -#include "kyra/gui_mr.h" -#include "kyra/kyra_mr.h" -#include "kyra/text_mr.h" -#include "kyra/resource.h" -#include "kyra/timer.h" -#include "kyra/sound_digital.h" +#include "kyra/gui/gui_mr.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/text/text_mr.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound_digital.h" #include "common/system.h" diff --git a/engines/kyra/gui_mr.h b/engines/kyra/gui/gui_mr.h index 62872a5355..91e0143b7f 100644 --- a/engines/kyra/gui_mr.h +++ b/engines/kyra/gui/gui_mr.h @@ -23,7 +23,7 @@ #ifndef KYRA_GUI_MR_H #define KYRA_GUI_MR_H -#include "kyra/gui_v2.h" +#include "kyra/gui/gui_v2.h" namespace Kyra { diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui/gui_rpg.cpp index 8e77a6e141..a55dd290e2 100644 --- a/engines/kyra/gui_rpg.cpp +++ b/engines/kyra/gui/gui_rpg.cpp @@ -22,7 +22,7 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" +#include "kyra/engine/kyra_rpg.h" namespace Kyra { diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui/gui_v1.cpp index 92891f71b2..50a5628f98 100644 --- a/engines/kyra/gui_v1.cpp +++ b/engines/kyra/gui/gui_v1.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/gui_v1.h" +#include "kyra/gui/gui_v1.h" -#include "kyra/text.h" -#include "kyra/wsamovie.h" +#include "kyra/text/text.h" +#include "kyra/graphics/wsamovie.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_v1.h b/engines/kyra/gui/gui_v1.h index 94be09037c..476aa54834 100644 --- a/engines/kyra/gui_v1.h +++ b/engines/kyra/gui/gui_v1.h @@ -23,7 +23,7 @@ #ifndef KYRA_GUI_V1_H #define KYRA_GUI_V1_H -#include "kyra/gui.h" +#include "kyra/gui/gui.h" namespace Kyra { diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui/gui_v2.cpp index afda573c61..b0a8bc18c8 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui/gui_v2.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/gui_v2.h" -#include "kyra/screen_v2.h" -#include "kyra/text.h" -#include "kyra/util.h" +#include "kyra/gui/gui_v2.h" +#include "kyra/graphics/screen_v2.h" +#include "kyra/text/text.h" +#include "kyra/engine/util.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_v2.h b/engines/kyra/gui/gui_v2.h index 34651e4c22..22cdf18a75 100644 --- a/engines/kyra/gui_v2.h +++ b/engines/kyra/gui/gui_v2.h @@ -23,7 +23,7 @@ #ifndef KYRA_GUI_V2_H #define KYRA_GUI_V2_H -#include "kyra/gui_v1.h" +#include "kyra/gui/gui_v1.h" namespace Kyra { diff --git a/engines/kyra/saveload.cpp b/engines/kyra/gui/saveload.cpp index 09d222aaae..b59f950c94 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/gui/saveload.cpp @@ -21,7 +21,7 @@ */ #include "kyra/kyra_v1.h" -#include "kyra/util.h" +#include "kyra/engine/util.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/gui/saveload_eob.cpp index 0b24ba552d..8f2c6e1838 100644 --- a/engines/kyra/saveload_eob.cpp +++ b/engines/kyra/gui/saveload_eob.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_EOB -#include "kyra/resource.h" -#include "kyra/script_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/script/script_eob.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/gui/saveload_hof.cpp index e8e76143bd..ebfbffe1f8 100644 --- a/engines/kyra/saveload_hof.cpp +++ b/engines/kyra/gui/saveload_hof.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/screen_v2.h" -#include "kyra/sound.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/graphics/screen_v2.h" +#include "kyra/sound/sound.h" +#include "kyra/engine/timer.h" #include "common/savefile.h" #include "common/substream.h" diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/gui/saveload_lok.cpp index 1d729d0103..493fcd029d 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/gui/saveload_lok.cpp @@ -20,11 +20,11 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/animator_lok.h" -#include "kyra/resource.h" -#include "kyra/sound.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" +#include "kyra/engine/timer.h" #include "common/savefile.h" diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/gui/saveload_lol.cpp index e02b8fb22c..0412dc6bdf 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/gui/saveload_lol.cpp @@ -22,8 +22,8 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" #include "common/savefile.h" #include "common/substream.h" diff --git a/engines/kyra/saveload_mr.cpp b/engines/kyra/gui/saveload_mr.cpp index a938003a07..c3c2d9bdf8 100644 --- a/engines/kyra/saveload_mr.cpp +++ b/engines/kyra/gui/saveload_mr.cpp @@ -25,8 +25,8 @@ #include "common/substream.h" #include "common/system.h" -#include "kyra/kyra_mr.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/engine/timer.h" namespace Kyra { diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/gui/saveload_rpg.cpp index 8f44960753..7e60f001c5 100644 --- a/engines/kyra/saveload_rpg.cpp +++ b/engines/kyra/gui/saveload_rpg.cpp @@ -22,8 +22,8 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/resource.h" -#include "kyra/script_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/script/script_eob.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 9fdddb89a9..cc0a92027f 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -34,8 +34,8 @@ #include "audio/mixer.h" -#include "kyra/script.h" -#include "kyra/item.h" +#include "kyra/script/script.h" +#include "kyra/engine/item.h" namespace Common { class OutSaveFile; diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk index 098c6da248..037ebe916e 100644 --- a/engines/kyra/module.mk +++ b/engines/kyra/module.mk @@ -1,104 +1,104 @@ MODULE := engines/kyra MODULE_OBJS := \ - animator_lok.o \ - animator_v2.o \ - animator_hof.o \ - animator_mr.o \ - animator_tim.o \ - debugger.o \ detection.o \ - gui.o \ - gui_v1.o \ - gui_lok.o \ - gui_v2.o \ - gui_hof.o \ - gui_mr.o \ - items_lok.o \ - items_v2.o \ - items_hof.o \ - items_mr.o \ - kyra_v1.o \ - kyra_lok.o \ - kyra_v2.o \ - kyra_hof.o \ - kyra_mr.o \ - resource.o \ - resource_intern.o \ - saveload.o \ - saveload_lok.o \ - saveload_hof.o \ - saveload_mr.o \ - scene_v1.o \ - scene_lok.o \ - scene_v2.o \ - scene_hof.o \ - scene_mr.o \ - screen.o \ - screen_lok.o \ - screen_v2.o \ - screen_hof.o \ - screen_mr.o \ - script_v1.o \ - script_lok.o \ - script_v2.o \ - script_hof.o \ - script_mr.o \ - script.o \ - script_tim.o \ - seqplayer.o \ - sequences_lok.o \ - sequences_v2.o \ - sequences_hof.o \ - sequences_mr.o \ - sound_adlib.o \ - sound_amiga.o \ - sound_digital.o \ - sound_midi.o \ - sound_pcspk.o \ - sound_towns.o \ - sound.o \ - sound_lok.o \ - sprites.o \ - staticres.o \ - text.o \ - text_lok.o \ - text_hof.o \ - text_mr.o \ - timer.o \ - timer_lok.o \ - timer_hof.o \ - timer_mr.o \ - util.o \ - vqa.o \ - wsamovie.o + engine/items_lok.o \ + engine/items_v2.o \ + engine/items_hof.o \ + engine/items_mr.o \ + engine/kyra_v1.o \ + engine/kyra_lok.o \ + engine/kyra_v2.o \ + engine/kyra_hof.o \ + engine/kyra_mr.o \ + engine/scene_v1.o \ + engine/scene_lok.o \ + engine/scene_v2.o \ + engine/scene_hof.o \ + engine/scene_mr.o \ + engine/sprites.o \ + engine/timer.o \ + engine/timer_lok.o \ + engine/timer_hof.o \ + engine/timer_mr.o \ + engine/util.o \ + graphics/animator_lok.o \ + graphics/animator_v2.o \ + graphics/animator_hof.o \ + graphics/animator_mr.o \ + graphics/animator_tim.o \ + graphics/screen.o \ + graphics/screen_lok.o \ + graphics/screen_v2.o \ + graphics/screen_hof.o \ + graphics/screen_mr.o \ + graphics/vqa.o \ + graphics/wsamovie.o \ + gui/debugger.o \ + gui/gui.o \ + gui/gui_v1.o \ + gui/gui_lok.o \ + gui/gui_v2.o \ + gui/gui_hof.o \ + gui/gui_mr.o \ + gui/saveload.o \ + gui/saveload_lok.o \ + gui/saveload_hof.o \ + gui/saveload_mr.o \ + resource/resource.o \ + resource/resource_intern.o \ + resource/staticres.o \ + script/script_v1.o \ + script/script_lok.o \ + script/script_v2.o \ + script/script_hof.o \ + script/script_mr.o \ + script/script.o \ + script/script_tim.o \ + sequence/seqplayer.o \ + sequence/sequences_lok.o \ + sequence/sequences_v2.o \ + sequence/sequences_hof.o \ + sequence/sequences_mr.o \ + sound/sound_adlib.o \ + sound/sound_amiga.o \ + sound/sound_digital.o \ + sound/sound_midi.o \ + sound/sound_pcspk.o \ + sound/sound_towns.o \ + sound/sound.o \ + sound/sound_lok.o \ + text/text.o \ + text/text_lok.o \ + text/text_hof.o \ + text/text_mr.o KYRARPG_COMMON_OBJ = \ - gui_rpg.o \ - kyra_rpg.o \ - saveload_rpg.o \ - scene_rpg.o \ - sprites_rpg.o \ - staticres_rpg.o \ - text_rpg.o \ - timer_rpg.o + engine/kyra_rpg.o \ + engine/scene_rpg.o \ + engine/sprites_rpg.o \ + engine/timer_rpg.o \ + gui/gui_rpg.o \ + gui/saveload_rpg.o \ + resource/staticres_rpg.o \ + text/text_rpg.o ifdef ENABLE_LOL MODULE_OBJS += \ $(KYRARPG_COMMON_OBJ) \ - gui_lol.o \ - items_lol.o \ - lol.o \ - saveload_lol.o \ - scene_lol.o \ - screen_lol.o \ - script_lol.o \ - sequences_lol.o \ - sound_lol.o \ - sprites_lol.o \ - staticres_lol.o \ - text_lol.o \ - timer_lol.o + engine/items_lol.o \ + engine/lol.o \ + engine/scene_lol.o \ + engine/sprites_lol.o \ + engine/timer_lol.o \ + graphics/screen_lol.o \ + gui/gui_lol.o \ + gui/saveload_lol.o \ + resource/staticres_lol.o \ + script/script_lol.o \ + sequence/sequences_lol.o \ + sound/sound_lol.o \ + text/text_lol.o endif ifdef ENABLE_EOB @@ -107,23 +107,23 @@ MODULE_OBJS += \ $(KYRARPG_COMMON_OBJ) endif MODULE_OBJS += \ - chargen.o \ - eobcommon.o \ - eob.o \ - darkmoon.o \ - gui_eob.o \ - items_eob.o \ - magic_eob.o \ - saveload_eob.o \ - scene_eob.o \ - screen_eob.o \ - script_eob.o \ - sequences_eob.o \ - sequences_darkmoon.o \ - sound_towns_darkmoon.o \ - sprites_eob.o \ - staticres_eob.o \ - timer_eob.o + engine/chargen.o \ + engine/eobcommon.o \ + engine/eob.o \ + engine/darkmoon.o \ + engine/items_eob.o \ + engine/magic_eob.o \ + engine/scene_eob.o \ + engine/sprites_eob.o \ + engine/timer_eob.o \ + graphics/screen_eob.o \ + gui/gui_eob.o \ + gui/saveload_eob.o \ + resource/staticres_eob.o \ + script/script_eob.o \ + sequence/sequences_eob.o \ + sequence/sequences_darkmoon.o \ + sound/sound_towns_darkmoon.o endif # This module can be built as a plugin diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource/resource.cpp index 3c801ee923..e13e644372 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource/resource.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/resource.h" -#include "kyra/resource_intern.h" +#include "kyra/resource/resource.h" +#include "kyra/resource/resource_intern.h" #include "common/config-manager.h" #include "common/fs.h" diff --git a/engines/kyra/resource.h b/engines/kyra/resource/resource.h index 9d496baac5..077b4eab7a 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource/resource.h @@ -35,9 +35,9 @@ #include "common/archive.h" #include "kyra/kyra_v1.h" -#include "kyra/darkmoon.h" -#include "kyra/lol.h" -#include "kyra/kyra_hof.h" +#include "kyra/engine/darkmoon.h" +#include "kyra/engine/lol.h" +#include "kyra/engine/kyra_hof.h" namespace Kyra { diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource/resource_intern.cpp index 9ec955477f..c32de44bc2 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource/resource_intern.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/resource_intern.h" -#include "kyra/resource.h" +#include "kyra/resource/resource_intern.h" +#include "kyra/resource/resource.h" #include "common/endian.h" #include "common/memstream.h" diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource/resource_intern.h index 530df51f35..530df51f35 100644 --- a/engines/kyra/resource_intern.h +++ b/engines/kyra/resource/resource_intern.h diff --git a/engines/kyra/staticres.cpp b/engines/kyra/resource/staticres.cpp index 2763362edb..fb6d14dd4b 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/resource/staticres.cpp @@ -20,19 +20,19 @@ * */ -#include "kyra/resource.h" -#include "kyra/kyra_lok.h" -#include "kyra/kyra_hof.h" -#include "kyra/kyra_mr.h" -#include "kyra/screen.h" -#include "kyra/screen_lok.h" -#include "kyra/screen_hof.h" -#include "kyra/screen_mr.h" -#include "kyra/gui_lok.h" -#include "kyra/gui_hof.h" -#include "kyra/gui_mr.h" -#include "kyra/sequences_hof.h" -#include "kyra/sound_intern.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/graphics/screen.h" +#include "kyra/graphics/screen_lok.h" +#include "kyra/graphics/screen_hof.h" +#include "kyra/graphics/screen_mr.h" +#include "kyra/gui/gui_lok.h" +#include "kyra/gui/gui_hof.h" +#include "kyra/gui/gui_mr.h" +#include "kyra/sequence/sequences_hof.h" +#include "kyra/sound/sound_intern.h" #include "common/endian.h" #include "common/md5.h" diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp index 933b120370..4a94c8448a 100644 --- a/engines/kyra/staticres_eob.cpp +++ b/engines/kyra/resource/staticres_eob.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/eob.h" -#include "kyra/resource.h" -#include "kyra/sound_intern.h" +#include "kyra/engine/eob.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound_intern.h" namespace Kyra { diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/resource/staticres_lol.cpp index e8d2a4ce70..b4093cee46 100644 --- a/engines/kyra/staticres_lol.cpp +++ b/engines/kyra/resource/staticres_lol.cpp @@ -20,11 +20,11 @@ * */ -#include "kyra/resource.h" -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/gui_lol.h" -#include "kyra/sound_intern.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/gui/gui_lol.h" +#include "kyra/sound/sound_intern.h" #ifdef ENABLE_LOL diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/resource/staticres_rpg.cpp index 55d14698fd..d0156e3340 100644 --- a/engines/kyra/staticres_rpg.cpp +++ b/engines/kyra/resource/staticres_rpg.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/resource.h" +#include "kyra/resource/resource.h" namespace Kyra { diff --git a/engines/kyra/script.cpp b/engines/kyra/script/script.cpp index 2452d7f41c..27c9643034 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script/script.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/script.h" +#include "kyra/script/script.h" #include "kyra/kyra_v1.h" -#include "kyra/resource.h" +#include "kyra/resource/resource.h" #include "common/endian.h" diff --git a/engines/kyra/script.h b/engines/kyra/script/script.h index 12a44b0a03..12a44b0a03 100644 --- a/engines/kyra/script.h +++ b/engines/kyra/script/script.h diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script/script_eob.cpp index eb1eb7d39c..709921deb9 100644 --- a/engines/kyra/script_eob.cpp +++ b/engines/kyra/script/script_eob.cpp @@ -22,11 +22,11 @@ #ifdef ENABLE_EOB -#include "kyra/eobcommon.h" -#include "kyra/screen_eob.h" -#include "kyra/script_eob.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/eobcommon.h" +#include "kyra/graphics/screen_eob.h" +#include "kyra/script/script_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/script_eob.h b/engines/kyra/script/script_eob.h index b996e314d5..b996e314d5 100644 --- a/engines/kyra/script_eob.h +++ b/engines/kyra/script/script_eob.h diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script/script_hof.cpp index f86d0e96bc..94d3a82cc4 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script/script_hof.cpp @@ -20,10 +20,10 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/timer.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/engine/timer.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script/script_lok.cpp index 380d7d551f..325ee67c9e 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script/script_lok.cpp @@ -20,13 +20,13 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/sprites.h" -#include "kyra/wsamovie.h" -#include "kyra/animator_lok.h" -#include "kyra/text.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/engine/sprites.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/text/text.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script/script_lol.cpp index 1a36527cdb..65d0f6c1e0 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script/script_lol.cpp @@ -22,11 +22,11 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/timer.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/engine/timer.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script/script_mr.cpp index 5ba645f1be..1051fccbc6 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script/script_mr.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/text_mr.h" -#include "kyra/resource.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/text/text_mr.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script/script_tim.cpp index e3b339cba6..7afa35c339 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script/script_tim.cpp @@ -20,13 +20,13 @@ * */ -#include "kyra/script_tim.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/script/script_tim.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" #endif // ENABLE_LOL #include "common/iff_container.h" diff --git a/engines/kyra/script_tim.h b/engines/kyra/script/script_tim.h index bd9c2645e5..bd9c2645e5 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script/script_tim.h diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script/script_v1.cpp index 3ac174a5b9..2fbd2f22f4 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script/script_v1.cpp @@ -21,7 +21,7 @@ */ #include "kyra/kyra_v1.h" -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" #include "common/system.h" diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script/script_v2.cpp index 179d388109..c8168a3353 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script/script_v2.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/kyra_v2.h" -#include "kyra/screen_v2.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/graphics/screen_v2.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/sequence/seqplayer.cpp index e1794b2416..d039a352f8 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/sequence/seqplayer.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/seqplayer.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/sequence/seqplayer.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/seqplayer.h b/engines/kyra/sequence/seqplayer.h index 155ed82a4e..8ca7fbac1b 100644 --- a/engines/kyra/seqplayer.h +++ b/engines/kyra/sequence/seqplayer.h @@ -23,7 +23,7 @@ #ifndef KYRA_SEQPLAYER_H #define KYRA_SEQPLAYER_H -#include "kyra/kyra_lok.h" +#include "kyra/engine/kyra_lok.h" namespace Kyra { diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp index 2f99ffe41d..532591e9b0 100644 --- a/engines/kyra/sequences_darkmoon.cpp +++ b/engines/kyra/sequence/sequences_darkmoon.cpp @@ -22,10 +22,10 @@ #ifdef ENABLE_EOB -#include "kyra/darkmoon.h" -#include "kyra/screen_eob.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/darkmoon.h" +#include "kyra/graphics/screen_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp index 187295bd2c..a04c5f75cd 100644 --- a/engines/kyra/sequences_eob.cpp +++ b/engines/kyra/sequence/sequences_eob.cpp @@ -22,10 +22,10 @@ #ifdef ENABLE_EOB -#include "kyra/eob.h" -#include "kyra/screen_eob.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/eob.h" +#include "kyra/graphics/screen_eob.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequence/sequences_hof.cpp index fc7a5239cc..5f41faad15 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequence/sequences_hof.cpp @@ -20,13 +20,13 @@ * */ -#include "kyra/kyra_hof.h" -#include "kyra/screen_hof.h" -#include "kyra/screen_lol.h" -#include "kyra/resource.h" -#include "kyra/sound.h" -#include "kyra/sequences_hof.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_hof.h" +#include "kyra/graphics/screen_hof.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" +#include "kyra/sequence/sequences_hof.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/sequences_hof.h b/engines/kyra/sequence/sequences_hof.h index 12fa4ffbc2..95d9260530 100644 --- a/engines/kyra/sequences_hof.h +++ b/engines/kyra/sequence/sequences_hof.h @@ -23,7 +23,7 @@ #ifndef KYRA_SEQUENCES_HOF_H #define KYRA_SEQUENCES_HOF_H -#include "kyra/kyra_v2.h" +#include "kyra/engine/kyra_v2.h" namespace Kyra { diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp index a8091c9d41..faddf762fb 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequence/sequences_lok.cpp @@ -20,14 +20,14 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/seqplayer.h" -#include "kyra/resource.h" -#include "kyra/sprites.h" -#include "kyra/wsamovie.h" -#include "kyra/animator_lok.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/sequence/seqplayer.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/sprites.h" +#include "kyra/graphics/wsamovie.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequence/sequences_lol.cpp index 4c87ff1dd8..55c0eb1493 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequence/sequences_lol.cpp @@ -22,10 +22,10 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/resource.h" -#include "kyra/sound.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/resource/resource.h" +#include "kyra/sound/sound.h" #include "base/version.h" diff --git a/engines/kyra/sequences_mr.cpp b/engines/kyra/sequence/sequences_mr.cpp index 0ac6b636b8..abfd0d8cbb 100644 --- a/engines/kyra/sequences_mr.cpp +++ b/engines/kyra/sequence/sequences_mr.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_mr.h" -#include "kyra/resource.h" +#include "kyra/engine/kyra_mr.h" +#include "kyra/resource/resource.h" namespace Kyra { diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequence/sequences_v2.cpp index 1bcbb7d874..4c32357684 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequence/sequences_v2.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_v2.h" -#include "kyra/resource.h" +#include "kyra/engine/kyra_v2.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound/sound.cpp index 6c0d529f96..39784f4682 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound/sound.cpp @@ -21,8 +21,8 @@ */ -#include "kyra/sound.h" -#include "kyra/resource.h" +#include "kyra/sound/sound.h" +#include "kyra/resource/resource.h" #include "audio/mixer.h" #include "audio/audiostream.h" diff --git a/engines/kyra/sound.h b/engines/kyra/sound/sound.h index 3f4216c5fb..3f4216c5fb 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound/sound.h diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound/sound_adlib.cpp index 1703fb904e..7a87e71982 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound/sound_adlib.cpp @@ -37,8 +37,8 @@ */ -#include "kyra/sound_intern.h" -#include "kyra/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" #include "common/system.h" #include "common/mutex.h" diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound/sound_adlib.h index f8486499ab..a5d6fe3659 100644 --- a/engines/kyra/sound_adlib.h +++ b/engines/kyra/sound/sound_adlib.h @@ -39,7 +39,7 @@ #ifndef KYRA_SOUND_ADLIB_H #define KYRA_SOUND_ADLIB_H -#include "kyra/sound.h" +#include "kyra/sound/sound.h" #include "common/mutex.h" diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound/sound_amiga.cpp index 598b5080a9..110400415f 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound/sound_amiga.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/sound_intern.h" -#include "kyra/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" #include "audio/mixer.h" #include "audio/mods/maxtrax.h" diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound/sound_digital.cpp index 551d79cc55..e3586605e8 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound/sound_digital.cpp @@ -20,9 +20,9 @@ * */ -#include "kyra/sound_digital.h" -#include "kyra/resource.h" -#include "kyra/kyra_mr.h" +#include "kyra/sound/sound_digital.h" +#include "kyra/resource/resource.h" +#include "kyra/engine/kyra_mr.h" #include "audio/audiostream.h" diff --git a/engines/kyra/sound_digital.h b/engines/kyra/sound/sound_digital.h index 271dde6a21..271dde6a21 100644 --- a/engines/kyra/sound_digital.h +++ b/engines/kyra/sound/sound_digital.h diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound/sound_intern.h index dd043790a2..77436d08ee 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound/sound_intern.h @@ -25,8 +25,8 @@ -#include "kyra/sound.h" -#include "kyra/sound_adlib.h" +#include "kyra/sound/sound.h" +#include "kyra/sound/sound_adlib.h" #include "common/mutex.h" diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound/sound_lok.cpp index c356f2fb67..34436637a0 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound/sound_lok.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/sound.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound/sound_lol.cpp index 5871040cd7..ae64af91b9 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound/sound_lol.cpp @@ -22,9 +22,9 @@ #ifdef ENABLE_LOL -#include "kyra/lol.h" -#include "kyra/sound.h" -#include "kyra/resource.h" +#include "kyra/engine/lol.h" +#include "kyra/sound/sound.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound/sound_midi.cpp index cd8bc2377c..c0cf6c1b16 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound/sound_midi.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/sound_intern.h" -#include "kyra/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/sound_pcspk.cpp b/engines/kyra/sound/sound_pcspk.cpp index 255d6b451a..110addefd8 100644 --- a/engines/kyra/sound_pcspk.cpp +++ b/engines/kyra/sound/sound_pcspk.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/sound_intern.h" +#include "kyra/sound/sound_intern.h" #include "audio/mixer.h" #include "audio/softsynth/pcspk.h" diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound/sound_towns.cpp index 94bfbcf915..621c2f1419 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound/sound_towns.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/sound_intern.h" -#include "kyra/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/kyra/sound_towns_darkmoon.cpp b/engines/kyra/sound/sound_towns_darkmoon.cpp index 76dca6c7bc..25fd4142b9 100644 --- a/engines/kyra/sound_towns_darkmoon.cpp +++ b/engines/kyra/sound/sound_towns_darkmoon.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/sound_intern.h" -#include "kyra/resource.h" +#include "kyra/sound/sound_intern.h" +#include "kyra/resource/resource.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/kyra/text.cpp b/engines/kyra/text/text.cpp index f88ba183ba..36af67e6aa 100644 --- a/engines/kyra/text.cpp +++ b/engines/kyra/text/text.cpp @@ -20,7 +20,7 @@ * */ -#include "kyra/text.h" +#include "kyra/text/text.h" #include "kyra/kyra_v1.h" namespace Kyra { diff --git a/engines/kyra/text.h b/engines/kyra/text/text.h index d5f423105e..3ea51c389c 100644 --- a/engines/kyra/text.h +++ b/engines/kyra/text/text.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" -#include "kyra/screen.h" +#include "kyra/graphics/screen.h" namespace Kyra { class KyraEngine_v1; diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text/text_hof.cpp index 354eff03b9..2d6332a0a2 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text/text_hof.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/text_hof.h" -#include "kyra/resource.h" +#include "kyra/text/text_hof.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/text_hof.h b/engines/kyra/text/text_hof.h index aacdc97d76..cced5bf536 100644 --- a/engines/kyra/text_hof.h +++ b/engines/kyra/text/text_hof.h @@ -23,7 +23,7 @@ #ifndef KYRA_TEXT_HOF_H #define KYRA_TEXT_HOF_H -#include "kyra/text.h" +#include "kyra/text/text.h" namespace Kyra { diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text/text_lok.cpp index 1ca5644b9d..c45f0410e3 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text/text_lok.cpp @@ -20,11 +20,11 @@ * */ -#include "kyra/text.h" -#include "kyra/kyra_lok.h" -#include "kyra/animator_lok.h" -#include "kyra/sprites.h" -#include "kyra/timer.h" +#include "kyra/text/text.h" +#include "kyra/engine/kyra_lok.h" +#include "kyra/graphics/animator_lok.h" +#include "kyra/engine/sprites.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text/text_lol.cpp index d8a36b954f..7c724e3b8e 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text/text_lol.cpp @@ -22,11 +22,11 @@ #ifdef ENABLE_LOL -#include "kyra/text_lol.h" -#include "kyra/lol.h" -#include "kyra/screen_lol.h" -#include "kyra/timer.h" -#include "kyra/sound.h" +#include "kyra/text/text_lol.h" +#include "kyra/engine/lol.h" +#include "kyra/graphics/screen_lol.h" +#include "kyra/engine/timer.h" +#include "kyra/sound/sound.h" #include "common/system.h" diff --git a/engines/kyra/text_lol.h b/engines/kyra/text/text_lol.h index ad3efadcaf..00428971ca 100644 --- a/engines/kyra/text_lol.h +++ b/engines/kyra/text/text_lol.h @@ -24,7 +24,7 @@ #define KYRA_TEXT_LOL_H #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/text_rpg.h" +#include "kyra/text/text_rpg.h" #endif #include "common/scummsys.h" diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text/text_mr.cpp index 685d5447cd..8400700503 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text/text_mr.cpp @@ -20,8 +20,8 @@ * */ -#include "kyra/text_mr.h" -#include "kyra/resource.h" +#include "kyra/text/text_mr.h" +#include "kyra/resource/resource.h" #include "common/system.h" diff --git a/engines/kyra/text_mr.h b/engines/kyra/text/text_mr.h index 5b6a7cd192..339aba691d 100644 --- a/engines/kyra/text_mr.h +++ b/engines/kyra/text/text_mr.h @@ -23,9 +23,9 @@ #ifndef KYRA_TEXT_MR_H #define KYRA_TEXT_MR_H -#include "kyra/text.h" +#include "kyra/text/text.h" -#include "kyra/kyra_mr.h" +#include "kyra/engine/kyra_mr.h" namespace Kyra { diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text/text_rpg.cpp index 1280d8c076..10e1a4409f 100644 --- a/engines/kyra/text_rpg.cpp +++ b/engines/kyra/text/text_rpg.cpp @@ -22,8 +22,8 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) -#include "kyra/kyra_rpg.h" -#include "kyra/timer.h" +#include "kyra/engine/kyra_rpg.h" +#include "kyra/engine/timer.h" #include "common/system.h" diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text/text_rpg.h index 30d3463726..30d3463726 100644 --- a/engines/kyra/text_rpg.h +++ b/engines/kyra/text/text_rpg.h |