aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMax Horn2009-02-27 02:23:40 +0000
committerMax Horn2009-02-27 02:23:40 +0000
commit479751104f6496d42057cd0419c7b78b5d289ca0 (patch)
tree06931df88bdb9667095e51b82567296b36fa4ce0 /engines/sci
parent170916201c2dd8b75dccefb9a39c6fee572a4ec9 (diff)
downloadscummvm-rg350-479751104f6496d42057cd0419c7b78b5d289ca0.tar.gz
scummvm-rg350-479751104f6496d42057cd0419c7b78b5d289ca0.tar.bz2
scummvm-rg350-479751104f6496d42057cd0419c7b78b5d289ca0.zip
SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
svn-id: r38921
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/game.cpp153
-rw-r--r--engines/sci/engine/gc.h2
-rw-r--r--engines/sci/engine/heap.cpp2
-rw-r--r--engines/sci/engine/kdebug.cpp2
-rw-r--r--engines/sci/engine/kernel.cpp2
-rw-r--r--engines/sci/engine/kevent.cpp2
-rw-r--r--engines/sci/engine/kfile.cpp2
-rw-r--r--engines/sci/engine/kgraphics.cpp2
-rw-r--r--engines/sci/engine/klists.cpp2
-rw-r--r--engines/sci/engine/kmath.cpp2
-rw-r--r--engines/sci/engine/kmenu.cpp2
-rw-r--r--engines/sci/engine/kmovement.cpp2
-rw-r--r--engines/sci/engine/kpathing.cpp2
-rw-r--r--engines/sci/engine/kscripts.cpp2
-rw-r--r--engines/sci/engine/ksound.cpp2
-rw-r--r--engines/sci/engine/kstring.cpp2
-rw-r--r--engines/sci/engine/said.cpp2
-rw-r--r--engines/sci/engine/said.y2
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/sci/engine/scriptconsole.cpp2
-rw-r--r--engines/sci/engine/scriptdebug.cpp2
-rw-r--r--engines/sci/engine/seg_manager.cpp2
-rw-r--r--engines/sci/engine/state.cpp181
-rw-r--r--engines/sci/engine/state.h (renamed from engines/sci/include/engine.h)0
-rw-r--r--engines/sci/engine/vm.cpp2
-rw-r--r--engines/sci/gfx/menubar.cpp2
-rw-r--r--engines/sci/gfx/sci_widgets.cpp2
-rw-r--r--engines/sci/gfx/sci_widgets.h2
-rw-r--r--engines/sci/module.mk1
-rw-r--r--engines/sci/sci.cpp2
-rw-r--r--engines/sci/scicore/sciconsole.cpp2
-rw-r--r--engines/sci/scicore/script.cpp2
-rw-r--r--engines/sci/scicore/versions.cpp2
-rw-r--r--engines/sci/scicore/vocab.cpp2
-rw-r--r--engines/sci/scicore/vocab_debug.cpp2
-rw-r--r--engines/sci/sfx/seq/map-mt32-to-gm.cpp2
36 files changed, 215 insertions, 184 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 68e86b48f6..8bec94736b 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -27,7 +27,7 @@
#include "common/file.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/scicore/versions.h"
#include "sci/engine/kernel.h"
#include "sci/engine/kernel_types.h"
@@ -440,157 +440,6 @@ static int create_class_table_sci0(EngineState *s) {
return 0;
}
-EngineState::EngineState() : _dirseeker(this) {
- savegame_version = 0;
-
- widget_serial_counter = 0;
-
- resmgr = 0;
-
- game_name = 0;
- game_version = 0;
-
- gfx_state = 0;
- old_screen = 0;
-
- memset(&sound, 0, sizeof(sound)); // FIXME: Remove this once/if we C++ify sfx_state_t
- sfx_init_flags = 0;
- sound_volume = 0;
- sound_mute = 0;
-
- restarting_flags = 0;
- have_mouse_flag = 0;
-
- pic_not_valid = 0;
- pic_is_new = 0;
- onscreen_console = 0;
- osc_backup = 0;
-
- pic_priority_table = 0;
-
- status_bar_text = 0;
-
- status_bar_foreground = 0;
- status_bar_background = 0;
-
- game_time = 0;
-
- save_dir_copy = NULL_REG;
- save_dir_edit_offset = 0;
- save_dir_copy_buf = 0;
-
- mouse_pointer_view = 0;
- mouse_pointer_loop = 0;
- mouse_pointer_cel = 0;
- save_mouse_pointer_view = 0;
- save_mouse_pointer_loop = 0;
- save_mouse_pointer_cel = 0;
-
- port_serial = 0;
- port = 0;
-
- memset(ega_colors, 0, sizeof(ega_colors));
-
- visual = 0;
-
- titlebar_port = 0;
- wm_port = 0;
- picture_port = 0;
- iconbar_port = 0;
-
- memset(&pic_visible_map, 0, sizeof(pic_visible_map)); // FIXME: Remove this once/if we C++ify gfx_map_mask_t
- pic_animate = 0;
-
- dyn_views_list_serial = 0;
- dyn_views = 0;
-
- drop_views_list_serial = 0;
- drop_views = 0;
-
- animation_delay = 0;
- animation_granularity = 0;
-
- menubar = 0;
-
- priority_first = 0;
- priority_last = 0;
-
- pics_drawn_nr = 0;
- pics_nr = 0;
- pics = 0;
-
- last_wait_time = 0;
-
- version_lock_flag = 0;
- version = 0;
- max_version = 0;
- min_version = 0;
-
- _fileHandles.resize(5);
-
- kernel_opt_flags = 0;
-
- execution_stack = 0;
- execution_stack_size = 0;
- execution_stack_pos = 0;
- execution_stack_base = 0;
- execution_stack_pos_changed = 0;
-
- r_acc = NULL_REG;
- r_amp_rest = 0;
- r_prev = NULL_REG;
-
- stack_segment = 0;
- stack_base = 0;
- stack_top = 0;
-
- parser_segment = 0;
- parser_base = NULL_REG;
- parser_event = NULL_REG;
- script_000_segment = 0;
- script_000 = 0;
-
- parser_lastmatch_word = 0;
- bp_list = 0;
- have_bp = 0;
- debug_mode = 0;
- sys_strings_segment = 0;
- sys_strings = 0;
- parser_words = 0;
- parser_words_nr = 0;
- parser_suffices = 0;
- parser_suffices_nr = 0;
- parser_branches = 0;
- parser_rules = 0;
- parser_branches_nr = 0;
- memset(parser_nodes, 0, sizeof(parser_nodes));
-
- parser_valid = 0;
-
- synonyms = 0;
- synonyms_nr = 0;
-
- game_obj = NULL_REG;
-
- classtable_size = 0;
- classtable = 0;
-
- seg_manager = 0;
- gc_countdown = 0;
-
- kernel_names_nr = 0;
- kernel_names = 0;
-
- kfunct_table = 0;
- kfunct_nr = 0;
-
- opcodes = 0;
-
- memset(&selector_map, 0, sizeof(selector_map)); // FIXME: Remove this once/if we C++ify selector_map_t
-
- successor = 0;
-}
-
// Architectural stuff: Init/Unintialize engine
int script_init_engine(EngineState *s, sci_version_t version) {
int result;
diff --git a/engines/sci/engine/gc.h b/engines/sci/engine/gc.h
index c0d9c1cfe2..e6fa737aaf 100644
--- a/engines/sci/engine/gc.h
+++ b/engines/sci/engine/gc.h
@@ -29,7 +29,7 @@
#include "common/hashmap.h"
#include "sci/engine/vm_types.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/engine/heap.cpp b/engines/sci/engine/heap.cpp
index a68c12bcbc..c3cea90d64 100644
--- a/engines/sci/engine/heap.cpp
+++ b/engines/sci/engine/heap.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/scicore/sciconsole.h"
#include "sci/engine/heap.h"
diff --git a/engines/sci/engine/kdebug.cpp b/engines/sci/engine/kdebug.cpp
index 55de752fec..2ab7310d24 100644
--- a/engines/sci/engine/kdebug.cpp
+++ b/engines/sci/engine/kdebug.cpp
@@ -26,7 +26,7 @@
#include "common/scummsys.h"
#include "sci/engine/kdebug.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 55b593ed7b..4d66d07ba7 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -32,7 +32,7 @@
#include "sci/engine/gc.h"
#include "sci/engine/kernel.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/operations.h"
#include "sci/engine/kernel_types.h"
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 20724236fc..ebf6ca0e7e 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 65193495b2..a23151f227 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -35,7 +35,7 @@
#include "common/savefile.h"
#include "sci/sci.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index e210e20158..4869cddc48 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -26,7 +26,7 @@
#include "common/system.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/sci_widgets.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index f56812a406..563099d609 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp
index b1d6959992..21fde8aeb2 100644
--- a/engines/sci/engine/kmath.cpp
+++ b/engines/sci/engine/kmath.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 88458bfaa4..faa4801ed9 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/sci_widgets.h"
#include "sci/gfx/menubar.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 3b175e4592..54f7bf14b2 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index f377a06c7f..231200f5c2 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -27,7 +27,7 @@
** which can be downloaded from FIXME.
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/aatree.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 88b3dbbc9d..d2f7256c79 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel_types.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 586aa1561d..22437d86b7 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/sfx/sfx_player.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 8327eef539..4b001b9782 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -26,7 +26,7 @@
/* String and parser handling */
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/message.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index acbb4f6bed..0f3fe9cea4 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -131,7 +131,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y
index d59de787dc..e8d0dce84c 100644
--- a/engines/sci/engine/said.y
+++ b/engines/sci/engine/said.y
@@ -24,7 +24,7 @@
*
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 5d80fca594..0ea6cbbe8b 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -36,7 +36,7 @@
#include "sci/gfx/operations.h"
#include "sci/gfx/menubar.h"
#include "sci/sfx/sfx_engine.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/heap.h"
#include "sci/engine/intmap.h"
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp
index 9be395ed5e..9a99685677 100644
--- a/engines/sci/engine/scriptconsole.cpp
+++ b/engines/sci/engine/scriptconsole.cpp
@@ -27,7 +27,7 @@
/* Remember, it doesn't have to be fast. */
#include "sci/sci_memory.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 1551edab59..56a9795c9f 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -26,7 +26,7 @@
// Script debugger functionality. Absolutely not threadsafe.
#include "sci/sci.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/gc.h"
#include "sci/engine/kdebug.h"
#include "sci/engine/kernel_types.h"
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index efa5746a61..9811505adb 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/engine/seg_manager.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/intmap.h"
namespace Sci {
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
new file mode 100644
index 0000000000..65262da82f
--- /dev/null
+++ b/engines/sci/engine/state.cpp
@@ -0,0 +1,181 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "sci/engine/state.h"
+
+namespace Sci {
+
+EngineState::EngineState() : _dirseeker(this) {
+ savegame_version = 0;
+
+ widget_serial_counter = 0;
+
+ resmgr = 0;
+
+ game_name = 0;
+ game_version = 0;
+
+ gfx_state = 0;
+ old_screen = 0;
+
+ memset(&sound, 0, sizeof(sound)); // FIXME: Remove this once/if we C++ify sfx_state_t
+ sfx_init_flags = 0;
+ sound_volume = 0;
+ sound_mute = 0;
+
+ restarting_flags = 0;
+ have_mouse_flag = 0;
+
+ pic_not_valid = 0;
+ pic_is_new = 0;
+ onscreen_console = 0;
+ osc_backup = 0;
+
+ pic_priority_table = 0;
+
+ status_bar_text = 0;
+
+ status_bar_foreground = 0;
+ status_bar_background = 0;
+
+ game_time = 0;
+
+ save_dir_copy = NULL_REG;
+ save_dir_edit_offset = 0;
+ save_dir_copy_buf = 0;
+
+ mouse_pointer_view = 0;
+ mouse_pointer_loop = 0;
+ mouse_pointer_cel = 0;
+ save_mouse_pointer_view = 0;
+ save_mouse_pointer_loop = 0;
+ save_mouse_pointer_cel = 0;
+
+ port_serial = 0;
+ port = 0;
+
+ memset(ega_colors, 0, sizeof(ega_colors));
+
+ visual = 0;
+
+ titlebar_port = 0;
+ wm_port = 0;
+ picture_port = 0;
+ iconbar_port = 0;
+
+ memset(&pic_visible_map, 0, sizeof(pic_visible_map)); // FIXME: Remove this once/if we C++ify gfx_map_mask_t
+ pic_animate = 0;
+
+ dyn_views_list_serial = 0;
+ dyn_views = 0;
+
+ drop_views_list_serial = 0;
+ drop_views = 0;
+
+ animation_delay = 0;
+ animation_granularity = 0;
+
+ menubar = 0;
+
+ priority_first = 0;
+ priority_last = 0;
+
+ pics_drawn_nr = 0;
+ pics_nr = 0;
+ pics = 0;
+
+ last_wait_time = 0;
+
+ version_lock_flag = 0;
+ version = 0;
+ max_version = 0;
+ min_version = 0;
+
+ _fileHandles.resize(5);
+
+ kernel_opt_flags = 0;
+
+ execution_stack = 0;
+ execution_stack_size = 0;
+ execution_stack_pos = 0;
+ execution_stack_base = 0;
+ execution_stack_pos_changed = 0;
+
+ r_acc = NULL_REG;
+ r_amp_rest = 0;
+ r_prev = NULL_REG;
+
+ stack_segment = 0;
+ stack_base = 0;
+ stack_top = 0;
+
+ parser_segment = 0;
+ parser_base = NULL_REG;
+ parser_event = NULL_REG;
+ script_000_segment = 0;
+ script_000 = 0;
+
+ parser_lastmatch_word = 0;
+ bp_list = 0;
+ have_bp = 0;
+ debug_mode = 0;
+ sys_strings_segment = 0;
+ sys_strings = 0;
+ parser_words = 0;
+ parser_words_nr = 0;
+ parser_suffices = 0;
+ parser_suffices_nr = 0;
+ parser_branches = 0;
+ parser_rules = 0;
+ parser_branches_nr = 0;
+ memset(parser_nodes, 0, sizeof(parser_nodes));
+
+ parser_valid = 0;
+
+ synonyms = 0;
+ synonyms_nr = 0;
+
+ game_obj = NULL_REG;
+
+ classtable_size = 0;
+ classtable = 0;
+
+ seg_manager = 0;
+ gc_countdown = 0;
+
+ kernel_names_nr = 0;
+ kernel_names = 0;
+
+ kfunct_table = 0;
+ kfunct_nr = 0;
+
+ opcodes = 0;
+
+ memset(&selector_map, 0, sizeof(selector_map)); // FIXME: Remove this once/if we C++ify selector_map_t
+
+ successor = 0;
+}
+
+} // End of namespace Sci
diff --git a/engines/sci/include/engine.h b/engines/sci/engine/state.h
index 8d49b0b184..8d49b0b184 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/engine/state.h
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 250f78f2cc..89077cf35e 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -26,7 +26,7 @@
#include "common/debug.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/scicore/versions.h"
#include "sci/engine/intmap.h"
#include "sci/engine/kdebug.h"
diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp
index 07b5e33e6e..bba6da660a 100644
--- a/engines/sci/gfx/menubar.cpp
+++ b/engines/sci/gfx/menubar.cpp
@@ -29,7 +29,7 @@
*/
#include "sci/sci_memory.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/menubar.h"
#include "sci/engine/kernel.h"
diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp
index d6ab47b4d2..b8ec30fedc 100644
--- a/engines/sci/gfx/sci_widgets.cpp
+++ b/engines/sci/gfx/sci_widgets.cpp
@@ -25,7 +25,7 @@
#include "sci/gfx/operations.h"
#include "sci/gfx/gfx_widgets.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/gfx/menubar.h"
#include "sci/gfx/sci_widgets.h"
diff --git a/engines/sci/gfx/sci_widgets.h b/engines/sci/gfx/sci_widgets.h
index ea7199dcc1..438f1f8ffb 100644
--- a/engines/sci/gfx/sci_widgets.h
+++ b/engines/sci/gfx/sci_widgets.h
@@ -28,7 +28,7 @@
#ifndef SCI_INCLUDE_SCI_WIDGETS_H
#define SCI_INCLUDE_SCI_WIDGETS_H
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 39cca125cc..1babcab4ca 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -31,6 +31,7 @@ MODULE_OBJS = \
engine/scriptconsole.o \
engine/scriptdebug.o \
engine/seg_manager.o \
+ engine/state.o \
engine/vm.o \
gfx/font.o \
gfx/gfx_driver.o \
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 38f33916ff..04113284fe 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -30,7 +30,7 @@
#include "engines/advancedDetector.h"
#include "sci/sci.h"
#include "sci/console.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/scicore/sciconsole.cpp b/engines/sci/scicore/sciconsole.cpp
index 7b2aa3ce23..0c0124aaf5 100644
--- a/engines/sci/scicore/sciconsole.cpp
+++ b/engines/sci/scicore/sciconsole.cpp
@@ -27,7 +27,7 @@
/* Remember, it doesn't have to be fast. */
#include "sci/sci_memory.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
namespace Sci {
diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp
index 879a0a7aff..53344d01c1 100644
--- a/engines/sci/scicore/script.cpp
+++ b/engines/sci/scicore/script.cpp
@@ -24,7 +24,7 @@
*/
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "common/util.h"
namespace Sci {
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index 6d58c62147..e3bfad421e 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -29,7 +29,7 @@
#include "common/config-manager.h"
#include "sci/scicore/versions.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/tools.h"
namespace Sci {
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index d3ad53832d..45c26f424e 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -27,7 +27,7 @@
#include "sci/scicore/vocabulary.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
namespace Sci {
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index e7b81d2ba5..2cb3f40e24 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -24,7 +24,7 @@
*/
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/scicore/resource.h"
namespace Sci {
diff --git a/engines/sci/sfx/seq/map-mt32-to-gm.cpp b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
index c6b66491e9..777409d694 100644
--- a/engines/sci/sfx/seq/map-mt32-to-gm.cpp
+++ b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
@@ -25,7 +25,7 @@
#include "common/scummsys.h"
#include "sci/scicore/resource.h"
-#include "sci/include/engine.h"
+#include "sci/engine/state.h"
#include "sci/sfx/seq/instrument-map.h"
namespace Sci {