- Moved all the files out of /sci/scicore and into /sci

- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608

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 {
 

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 {
 

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 {

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"

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 {
 

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"

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"

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"

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"
 

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"

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"

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 {

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

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"
 

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"
 

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"

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"

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"
 

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 \

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 {
 

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;

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"
 

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 {
 

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 {
 

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"

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 {

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

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. */

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 {
 

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"