aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/console.cpp4
-rw-r--r--engines/sci/console.h2
-rw-r--r--engines/sci/decompressor.cpp (renamed from engines/sci/scicore/decompressor.cpp)2
-rw-r--r--engines/sci/decompressor.h (renamed from engines/sci/scicore/decompressor.h)0
-rw-r--r--engines/sci/engine/game.cpp2
-rw-r--r--engines/sci/engine/grammar.cpp4
-rw-r--r--engines/sci/engine/kernel.cpp2
-rw-r--r--engines/sci/engine/kgraphics.cpp2
-rw-r--r--engines/sci/engine/kmenu.cpp2
-rw-r--r--engines/sci/engine/kmovement.cpp2
-rw-r--r--engines/sci/engine/kscripts.cpp2
-rw-r--r--engines/sci/engine/kstring.cpp2
-rw-r--r--engines/sci/engine/message.h2
-rw-r--r--engines/sci/engine/sciconsole.cpp (renamed from engines/sci/engine/scriptconsole.cpp)2
-rw-r--r--engines/sci/engine/sciconsole.h (renamed from engines/sci/scicore/sciconsole.h)0
-rw-r--r--engines/sci/engine/script.cpp2
-rw-r--r--engines/sci/engine/scriptdebug.cpp6
-rw-r--r--engines/sci/engine/state.h4
-rw-r--r--engines/sci/engine/vm.cpp2
-rw-r--r--engines/sci/gfx/gfx_resmgr.h2
-rw-r--r--engines/sci/module.mk10
-rw-r--r--engines/sci/resource.cpp (renamed from engines/sci/scicore/resource.cpp)6
-rw-r--r--engines/sci/resource.h (renamed from engines/sci/scicore/resource.h)2
-rw-r--r--engines/sci/sci.cpp2
-rw-r--r--engines/sci/sci.h2
-rw-r--r--engines/sci/sfx/core.h2
-rw-r--r--engines/sci/sfx/player.h2
-rw-r--r--engines/sci/sfx/softseq/adlib.cpp2
-rw-r--r--engines/sci/tools.cpp2
-rw-r--r--engines/sci/tools.h2
-rw-r--r--engines/sci/vocab_debug.cpp (renamed from engines/sci/scicore/vocab_debug.cpp)2
-rw-r--r--engines/sci/vocabulary.cpp (renamed from engines/sci/scicore/vocabulary.cpp)4
-rw-r--r--engines/sci/vocabulary.h (renamed from engines/sci/scicore/vocabulary.h)0
33 files changed, 42 insertions, 42 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 0ac0fd9aa4..b76a7fea4b 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -27,8 +27,8 @@
#include "sci/sci.h"
#include "sci/console.h"
-#include "sci/scicore/resource.h"
-#include "sci/scicore/vocabulary.h"
+#include "sci/resource.h"
+#include "sci/vocabulary.h"
namespace Sci {
diff --git a/engines/sci/console.h b/engines/sci/console.h
index ef1f10cbd3..5307fa14cc 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -29,7 +29,7 @@
#define SCI_CONSOLE_H
#include "gui/debugger.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/engine/sciconsole.h"
namespace Sci {
diff --git a/engines/sci/scicore/decompressor.cpp b/engines/sci/decompressor.cpp
index 91738aa1d8..c1b10b9af1 100644
--- a/engines/sci/scicore/decompressor.cpp
+++ b/engines/sci/decompressor.cpp
@@ -29,7 +29,7 @@
#include "common/endian.h"
#include "common/debug.h"
-#include "sci/scicore/decompressor.h"
+#include "sci/decompressor.h"
#include "sci/sci.h"
namespace Sci {
diff --git a/engines/sci/scicore/decompressor.h b/engines/sci/decompressor.h
index 5f24b0f41d..5f24b0f41d 100644
--- a/engines/sci/scicore/decompressor.h
+++ b/engines/sci/decompressor.h
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index b0df4aacde..5b25fea6e2 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -27,7 +27,7 @@
#include "common/file.h"
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/engine/kernel_types.h"
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index d4483045cc..63cd8a9b4a 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -29,8 +29,8 @@
*/
#include "sci/tools.h"
-#include "sci/scicore/vocabulary.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/vocabulary.h"
+#include "sci/engine/sciconsole.h"
namespace Sci {
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index d22e04ea05..ad9b57c54f 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -31,7 +31,7 @@
#include "sci/engine/intmap.h"
#include "sci/engine/gc.h"
#include "sci/engine/kernel.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/gfx/operations.h"
#include "sci/engine/kernel_types.h"
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index e32db3e1cb..e149acfc43 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -26,7 +26,7 @@
#include "common/system.h"
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/gfx/gfx_gui.h"
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 5f585b26de..771af2a661 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/gfx/gfx_gui.h"
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 8b3c2d0db0..9b28c1fa6d 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index f00731aab4..bb4c98761f 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel_types.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index edb5424219..0be3ac706b 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -25,7 +25,7 @@
/* String and parser handling */
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/message.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index 82c5e4f721..b1cdb8ad99 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -26,7 +26,7 @@
#ifndef SCI_ENGINE_MESSAGE_H
#define SCI_ENGINE_MESSAGE_H
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "common/stack.h"
namespace Sci {
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/sciconsole.cpp
index 569c14a519..3cdb6a1768 100644
--- a/engines/sci/engine/scriptconsole.cpp
+++ b/engines/sci/engine/sciconsole.cpp
@@ -27,7 +27,7 @@
/* Remember, it doesn't have to be fast. */
#include "sci/engine/state.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/engine/sciconsole.h"
#include "sci/sci.h" // For _console only
#include "sci/console.h" // For _console only
diff --git a/engines/sci/scicore/sciconsole.h b/engines/sci/engine/sciconsole.h
index b2060143aa..b2060143aa 100644
--- a/engines/sci/scicore/sciconsole.h
+++ b/engines/sci/engine/sciconsole.h
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 828ea1f14d..7de9a7539e 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "common/util.h"
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 5dcf42cf59..8773b2b9c8 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -32,12 +32,12 @@
#include "sci/engine/kernel_types.h"
#include "sci/engine/kernel.h"
#include "sci/engine/savegame.h"
+#include "sci/engine/sciconsole.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_gui.h"
#include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual
-#include "sci/scicore/resource.h"
-#include "sci/scicore/sciconsole.h"
-#include "sci/scicore/vocabulary.h"
+#include "sci/resource.h"
+#include "sci/vocabulary.h"
#include "sci/sfx/iterator.h"
#include "sci/sfx/sci_midi.h"
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index d8975a0aae..f6ec22a394 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -36,8 +36,8 @@ namespace Common {
}
#include "sci/sci.h"
-#include "sci/scicore/vocabulary.h"
-#include "sci/scicore/resource.h"
+#include "sci/vocabulary.h"
+#include "sci/resource.h"
#include "sci/engine/kernel.h" // for kfunct_sig_pair_t
#include "sci/engine/script.h"
#include "sci/engine/seg_manager.h"
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 81b279f00f..73e4499d20 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -27,7 +27,7 @@
#include "common/stack.h"
#include "sci/sci.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/intmap.h"
#include "sci/engine/kdebug.h"
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index 647aa82b02..4c6163c7c4 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -31,7 +31,7 @@
// or something like that.
#include "sci/gfx/gfx_resource.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "common/hashmap.h"
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 9a8fd4fc17..441552f5bd 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -2,10 +2,14 @@ MODULE := engines/sci
MODULE_OBJS = \
console.o \
+ decompressor.o \
detection.o \
exereader.o \
+ resource.o \
sci.o \
tools.o \
+ vocabulary.o \
+ vocab_debug.o \
engine/game.o \
engine/gc.o \
engine/grammar.o \
@@ -26,8 +30,8 @@ MODULE_OBJS = \
engine/message.o \
engine/said.o \
engine/savegame.o \
+ engine/sciconsole.o \
engine/script.o \
- engine/scriptconsole.o \
engine/scriptdebug.o \
engine/seg_manager.o \
engine/stringfrag.o \
@@ -52,10 +56,6 @@ MODULE_OBJS = \
gfx/res_pic.o \
gfx/res_view0.o \
gfx/res_view1.o \
- scicore/decompressor.o \
- scicore/resource.o \
- scicore/vocabulary.o \
- scicore/vocab_debug.o \
sfx/adlib_sbi.o \
sfx/core.o \
sfx/iterator.o \
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/resource.cpp
index 9b7d7dca98..71624c4509 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -32,9 +32,9 @@
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/tools.h"
-#include "sci/scicore/resource.h"
-#include "sci/scicore/vocabulary.h"
-#include "sci/scicore/decompressor.h"
+#include "sci/resource.h"
+#include "sci/vocabulary.h"
+#include "sci/decompressor.h"
namespace Sci {
diff --git a/engines/sci/scicore/resource.h b/engines/sci/resource.h
index e827152c57..5e6f2e7e5e 100644
--- a/engines/sci/scicore/resource.h
+++ b/engines/sci/resource.h
@@ -31,7 +31,7 @@
#include "common/archive.h"
#include "sci/engine/vm.h" // for Object
-#include "sci/scicore/decompressor.h"
+#include "sci/decompressor.h"
namespace Common {
class ReadStream;
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index b2532e46b2..725ad94ac4 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -30,8 +30,8 @@
#include "engines/advancedDetector.h"
#include "sci/sci.h"
#include "sci/console.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/engine/sciconsole.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index b8eed055e5..53eda6246e 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -29,7 +29,7 @@
#include "engines/engine.h"
#include "engines/advancedDetector.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
namespace Sci {
diff --git a/engines/sci/sfx/core.h b/engines/sci/sfx/core.h
index ca5025edf7..acf8c67d70 100644
--- a/engines/sci/sfx/core.h
+++ b/engines/sci/sfx/core.h
@@ -29,7 +29,7 @@
#include "common/error.h"
#include "sci/sfx/songlib.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
namespace Sci {
diff --git a/engines/sci/sfx/player.h b/engines/sci/sfx/player.h
index ca73d5b582..e2bf952d28 100644
--- a/engines/sci/sfx/player.h
+++ b/engines/sci/sfx/player.h
@@ -28,7 +28,7 @@
#ifndef SCI_SFX_SFX_PLAYER_H
#define SCI_SFX_SFX_PLAYER_H
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/sfx/iterator.h"
#include "common/scummsys.h"
diff --git a/engines/sci/sfx/softseq/adlib.cpp b/engines/sci/sfx/softseq/adlib.cpp
index 86ef29b708..fa075e0055 100644
--- a/engines/sci/sfx/softseq/adlib.cpp
+++ b/engines/sci/sfx/softseq/adlib.cpp
@@ -29,7 +29,7 @@
#include "sound/fmopl.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
#include "sci/sfx/softseq/adlib.h"
namespace Sci {
diff --git a/engines/sci/tools.cpp b/engines/sci/tools.cpp
index f21196b27b..864e182705 100644
--- a/engines/sci/tools.cpp
+++ b/engines/sci/tools.cpp
@@ -25,7 +25,7 @@
#include "sci/tools.h"
#include "sci/engine/state.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/engine/sciconsole.h"
#include "sci/sci.h" // For _console only
#include "sci/console.h" // For _console only
diff --git a/engines/sci/tools.h b/engines/sci/tools.h
index 16de948422..e8f954b846 100644
--- a/engines/sci/tools.h
+++ b/engines/sci/tools.h
@@ -36,7 +36,7 @@ int sciprintf(const char *fmt, ...) GCC_PRINTF(1, 2);
** Parameters: fmt: a printf-style format string
** ...: Additional parameters as defined in fmt
** Returns : (int) 1
-** Implementation is in src/scicore/console.c
+** Implementation is in src/console.c
*/
/** Find first set bit in bits and return its index. Returns 0 if bits is 0. */
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/vocab_debug.cpp
index caafa32ca7..9dda66d617 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/vocab_debug.cpp
@@ -25,7 +25,7 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/scicore/resource.h"
+#include "sci/resource.h"
namespace Sci {
diff --git a/engines/sci/scicore/vocabulary.cpp b/engines/sci/vocabulary.cpp
index af63a9803a..7df8d7f5cc 100644
--- a/engines/sci/scicore/vocabulary.cpp
+++ b/engines/sci/vocabulary.cpp
@@ -25,8 +25,8 @@
// Main vocabulary support functions and word lookup
-#include "sci/scicore/vocabulary.h"
-#include "sci/scicore/resource.h"
+#include "sci/vocabulary.h"
+#include "sci/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/scicore/vocabulary.h b/engines/sci/vocabulary.h
index d0c807aebf..d0c807aebf 100644
--- a/engines/sci/scicore/vocabulary.h
+++ b/engines/sci/vocabulary.h