From 479751104f6496d42057cd0419c7b78b5d289ca0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 27 Feb 2009 02:23:40 +0000 Subject: SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor svn-id: r38921 --- engines/sci/engine/game.cpp | 153 +--------------- engines/sci/engine/gc.h | 2 +- engines/sci/engine/heap.cpp | 2 +- engines/sci/engine/kdebug.cpp | 2 +- engines/sci/engine/kernel.cpp | 2 +- engines/sci/engine/kevent.cpp | 2 +- engines/sci/engine/kfile.cpp | 2 +- engines/sci/engine/kgraphics.cpp | 2 +- engines/sci/engine/klists.cpp | 2 +- engines/sci/engine/kmath.cpp | 2 +- engines/sci/engine/kmenu.cpp | 2 +- engines/sci/engine/kmovement.cpp | 2 +- engines/sci/engine/kpathing.cpp | 2 +- engines/sci/engine/kscripts.cpp | 2 +- engines/sci/engine/ksound.cpp | 2 +- engines/sci/engine/kstring.cpp | 2 +- engines/sci/engine/said.cpp | 2 +- engines/sci/engine/said.y | 2 +- engines/sci/engine/savegame.cpp | 2 +- engines/sci/engine/scriptconsole.cpp | 2 +- engines/sci/engine/scriptdebug.cpp | 2 +- engines/sci/engine/seg_manager.cpp | 2 +- engines/sci/engine/state.cpp | 181 ++++++++++++++++++ engines/sci/engine/state.h | 323 +++++++++++++++++++++++++++++++++ engines/sci/engine/vm.cpp | 2 +- engines/sci/gfx/menubar.cpp | 2 +- engines/sci/gfx/sci_widgets.cpp | 2 +- engines/sci/gfx/sci_widgets.h | 2 +- engines/sci/include/engine.h | 323 --------------------------------- engines/sci/module.mk | 1 + engines/sci/sci.cpp | 2 +- engines/sci/scicore/sciconsole.cpp | 2 +- engines/sci/scicore/script.cpp | 2 +- engines/sci/scicore/versions.cpp | 2 +- engines/sci/scicore/vocab.cpp | 2 +- engines/sci/scicore/vocab_debug.cpp | 2 +- engines/sci/sfx/seq/map-mt32-to-gm.cpp | 2 +- 37 files changed, 538 insertions(+), 507 deletions(-) create mode 100644 engines/sci/engine/state.cpp create mode 100644 engines/sci/engine/state.h delete mode 100644 engines/sci/include/engine.h 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/engine/state.h b/engines/sci/engine/state.h new file mode 100644 index 0000000000..8d49b0b184 --- /dev/null +++ b/engines/sci/engine/state.h @@ -0,0 +1,323 @@ +/* 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$ + * + */ + +#ifndef SCI_INCLUDE_ENGINE_H +#define SCI_INCLUDE_ENGINE_H + +#include "common/scummsys.h" +#include "common/array.h" + +namespace Common { + class SeekableReadStream; + class WriteStream; +} + +#include "sci/scicore/vocabulary.h" +#include "sci/scicore/resource.h" +#include "sci/engine/script.h" +#include "sci/scicore/sciconsole.h" +#include "sci/scicore/versions.h" +#include "sci/engine/seg_manager.h" +#include "sci/gfx/gfx_state_internal.h" +#include "sci/sfx/sfx_engine.h" + +namespace Sci { + +struct menubar_t; +struct kfunct_sig_pair_t; // from kernel.h + +class DirSeeker { +protected: + EngineState *_vm; + reg_t _outbuffer; + Common::StringList _savefiles; + Common::StringList::const_iterator _iter; + +public: + DirSeeker(EngineState *s) : _vm(s) { + _outbuffer = NULL_REG; + _iter = _savefiles.begin(); + } + + void firstFile(const char *mask, reg_t buffer); + void nextFile(); +}; + +#define FREESCI_CURRENT_SAVEGAME_VERSION 8 +#define FREESCI_MINIMUM_SAVEGAME_VERSION 8 + +#define MAX_GAMEDIR_SIZE 32 /* Used for subdirectory inside of "~/.freesci/" */ +#define MAX_SAVEGAME_NR 20 /* Maximum number of savegames */ + +#define MAX_SAVE_DIR_SIZE MAXPATHLEN + +/* values for EngineState.restarting_flag */ +#define SCI_GAME_IS_NOT_RESTARTING 0 +#define SCI_GAME_WAS_RESTARTED 1 +#define SCI_GAME_IS_RESTARTING_NOW 2 +#define SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE 4 + +struct drawn_pic_t { + int nr; + int palette; +}; + +// Savegame metadata +struct SavegameMetadata { + const char *savegame_name; + int savegame_version; + char *game_version; + sci_version_t version; + int savegame_date; + int savegame_time; +}; + +class FileHandle { +public: + Common::String _name; + Common::SeekableReadStream *_in; + Common::WriteStream *_out; + +public: + FileHandle(); + ~FileHandle(); + + void close(); + bool isOpen() const; +}; + +struct EngineState { + EngineState(); + + int savegame_version; + + int widget_serial_counter; /* Used for savegames */ + + ResourceManager *resmgr; /* The resource manager */ + + char *game_name; /* Designation of the primary object (which inherits from Game) */ + char *game_version; + + /* Non-VM information */ + + gfx_state_t *gfx_state; /* Graphics state and driver */ + gfx_pixmap_t *old_screen; /* Old screen content: Stored during kDrawPic() for kAnimate() */ + + sfx_state_t sound; /* sound subsystem */ + int sfx_init_flags; /* flags the sfx subsystem was initialised with */ + unsigned int sound_volume; /* 0x0 -> 0xf Current volume of sound system */ + unsigned int sound_mute; /* 0 = not, else == saved value */ + + byte restarting_flags; /* Flags used for restarting */ + byte have_mouse_flag; /* Do we have a hardware pointing device? */ + + byte pic_not_valid; /* Is 0 if the background picture is "valid" */ + byte pic_is_new; /* New pic was loaded or port was opened */ + byte onscreen_console; /* Use the onscreen console for debugging */ + byte *osc_backup; /* Backup of the pre-onscreen console screen data */ + + int *pic_priority_table; /* 16 entries with priorities or NULL if not present */ + + char *status_bar_text; /* Text on the status bar, or NULL if the title bar is blank */ + + int status_bar_foreground, status_bar_background; + + long game_time; /* Counted at 60 ticks per second, reset during start time */ + + reg_t save_dir_copy; /* Last copy of the save dir */ + int save_dir_edit_offset; /* For kEdit(): Display offset for editing the savedir */ + char *save_dir_copy_buf; /* Temp savedir buffer for kEdit() */ + + int mouse_pointer_view; /* Mouse pointer resource, or -1 if disabled */ + int mouse_pointer_loop; /* Mouse pointer resource, or -1 if disabled */ + int mouse_pointer_cel; /* Mouse pointer resource, or -1 if disabled */ + int save_mouse_pointer_view; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ + int save_mouse_pointer_loop; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ + int save_mouse_pointer_cel; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ + + int port_serial; /* Port serial number, for save/restore */ + gfxw_port_t *port; /* The currently active port */ + + gfx_color_t ega_colors[16]; /* The 16 EGA colors- for SCI0(1) */ + + gfxw_visual_t *visual; /* A visual widget, containing all ports */ + + gfxw_port_t *titlebar_port; /* Title bar viewport (0,0,9,319) */ + gfxw_port_t *wm_port; /* window manager viewport and designated &heap[0] view (10,0,199,319) */ + gfxw_port_t *picture_port; /* The background picture viewport (10,0,199,319) */ + gfxw_port_t *iconbar_port; /* Full-screen port used for non-clipped icon bar draw in SCI1 */ + + gfx_map_mask_t pic_visible_map; /* The number of the map to display in update commands */ + int pic_animate; /* The animation used by Animate() to display the picture */ + + int dyn_views_list_serial; /* Used for save/restore */ + gfxw_list_t *dyn_views; /* Pointers to pic and dynamic view lists */ + + int drop_views_list_serial; /* Used for save/restore */ + gfxw_list_t *drop_views; /* A list Animate() can dump dropped dynviews into */ + + long animation_delay; /* A delay factor for pic opening animations. Defaults to 500. */ + int animation_granularity; /* Number of animation steps to perform betwen updates for transition animations */ + + menubar_t *menubar; /* The menu bar */ + + int priority_first; /* The line where priority zone 0 ends */ + int priority_last; /* The line where the highest priority zone starts */ + + int pics_drawn_nr; + int pics_nr; + drawn_pic_t *pics; + + uint32 game_start_time; /* The time at which the interpreter was started */ + uint32 last_wait_time; /* The last time the game invoked Wait() */ + + byte version_lock_flag; /* Set to 1 to disable any autodetection mechanisms */ + sci_version_t version; /* The approximated patchlevel of the version to emulate */ + sci_version_t max_version, min_version; /* Used for autodetect sanity checks */ + + unsigned int kernel_opt_flags; /* Kernel optimization flags- used for performance tweaking */ + + /* Kernel File IO stuff */ + + Common::Array _fileHandles; /* Array of file handles. Dynamically increased if required. */ + + DirSeeker _dirseeker; + + /* VM Information */ + + exec_stack_t *execution_stack; /* The execution stack */ + int execution_stack_size; /* Number of stack frames allocated */ + int execution_stack_pos; /* Position on the execution stack */ + int execution_stack_base; /* When called from kernel functions, the vm + ** is re-started recursively on the same stack. + ** This variable contains the stack base for the + ** current vm. + */ + int execution_stack_pos_changed; /* Set to 1 if the execution stack position + ** should be re-evaluated by the vm + */ + + reg_t r_acc; /* Accumulator */ + unsigned int r_amp_rest; /* &rest register (only used for save games) */ + reg_t r_prev; /* previous comparison result */ + + seg_id_t stack_segment; /* Heap area for the stack to use */ + stack_ptr_t stack_base; /* Pointer to the least stack element */ + stack_ptr_t stack_top; /* First invalid stack element */ + + seg_id_t parser_segment; /* A heap area used by the parser for error reporting */ + reg_t parser_base; /* Base address for the parser error reporting mechanism */ + reg_t parser_event; /* The event passed to Parse() and later used by Said() */ + seg_id_t script_000_segment; + script_t *script_000; /* script 000, e.g. for globals */ + + int parser_lastmatch_word; /* Position of the input word the parser last matched on, or SAID_NO_MATCH */ + + /* Debugger data: */ + breakpoint_t *bp_list; /* List of breakpoints */ + int have_bp; /* Bit mask specifying which types of breakpoints are used in bp_list */ + unsigned int debug_mode; /* Contains flags for the various debug modes */ + + /* System strings */ + seg_id_t sys_strings_segment; + SystemStrings *sys_strings; + + /* Parser data: */ + word_t **parser_words; + int parser_words_nr; + suffix_t **parser_suffices; + int parser_suffices_nr; + parse_tree_branch_t *parser_branches; + parse_rule_list_t *parser_rules; /* GNF rules used in the parser algorithm */ + int parser_branches_nr; + parse_tree_node_t parser_nodes[VOCAB_TREE_NODES]; /* The parse tree */ + + int parser_valid; /* If something has been correctly parsed */ + + synonym_t *synonyms; /* The list of synonyms */ + int synonyms_nr; + + reg_t game_obj; /* Pointer to the game object */ + + int classtable_size; /* Number of classes in the table- for debugging */ + class_t *classtable; /* Table of all classes */ + + SegManager *seg_manager; + int gc_countdown; /* Number of kernel calls until next gc */ + + Common::StringList _selectorNames; + int kernel_names_nr; /* Number of kernel function names */ + char **kernel_names; /* List of kernel names */ + + kfunct_sig_pair_t *kfunct_table; /* Table of kernel functions */ + int kfunct_nr; /* Number of mapped kernel functions; may be more than + ** kernel_names_nr */ + + opcode *opcodes; + + selector_map_t selector_map; /* Shortcut list for important selectors */ + + EngineState *successor; /* Successor of this state: Used for restoring */ +}; + + +#define STATE_T_DEFINED + +int gamestate_save(EngineState *s, Common::WriteStream *save, const char *savename); +/* Saves a game state to the hard disk in a portable way +** Parameters: (EngineState *) s: The state to save +** (WriteStream *) save: The stream to save to +** (char *) savename: The description of the savegame +** Returns : (int) 0 on success, 1 otherwise +*/ + +EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *save); +/* Restores a game state from a directory +** Parameters: (EngineState *) s: An older state from the same game +** (char *) dirname: The subdirectory to restore from +** Returns : (EngineState *) NULL on failure, a pointer to a valid EngineState otherwise +*/ + +bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata* meta); +/* Read the header from a savegame +*/ + +gfx_pixmap_color_t *get_pic_color(EngineState *s, int color); +/* Retrieves the gfx_pixmap_color_t associated with a game color index +** Parameters: (EngineState *) s: The game state +** (int) color: The color to look up +** Returns : (gfx_pixmap_color_t *) The requested color. +*/ + +static inline reg_t not_register(EngineState *s, reg_t r) { + if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE) + return make_reg(0, !r.offset); + else + return r; +} + +} // End of namespace Sci + +#endif // SCI_INCLUDE_ENGINE_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/include/engine.h b/engines/sci/include/engine.h deleted file mode 100644 index 8d49b0b184..0000000000 --- a/engines/sci/include/engine.h +++ /dev/null @@ -1,323 +0,0 @@ -/* 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$ - * - */ - -#ifndef SCI_INCLUDE_ENGINE_H -#define SCI_INCLUDE_ENGINE_H - -#include "common/scummsys.h" -#include "common/array.h" - -namespace Common { - class SeekableReadStream; - class WriteStream; -} - -#include "sci/scicore/vocabulary.h" -#include "sci/scicore/resource.h" -#include "sci/engine/script.h" -#include "sci/scicore/sciconsole.h" -#include "sci/scicore/versions.h" -#include "sci/engine/seg_manager.h" -#include "sci/gfx/gfx_state_internal.h" -#include "sci/sfx/sfx_engine.h" - -namespace Sci { - -struct menubar_t; -struct kfunct_sig_pair_t; // from kernel.h - -class DirSeeker { -protected: - EngineState *_vm; - reg_t _outbuffer; - Common::StringList _savefiles; - Common::StringList::const_iterator _iter; - -public: - DirSeeker(EngineState *s) : _vm(s) { - _outbuffer = NULL_REG; - _iter = _savefiles.begin(); - } - - void firstFile(const char *mask, reg_t buffer); - void nextFile(); -}; - -#define FREESCI_CURRENT_SAVEGAME_VERSION 8 -#define FREESCI_MINIMUM_SAVEGAME_VERSION 8 - -#define MAX_GAMEDIR_SIZE 32 /* Used for subdirectory inside of "~/.freesci/" */ -#define MAX_SAVEGAME_NR 20 /* Maximum number of savegames */ - -#define MAX_SAVE_DIR_SIZE MAXPATHLEN - -/* values for EngineState.restarting_flag */ -#define SCI_GAME_IS_NOT_RESTARTING 0 -#define SCI_GAME_WAS_RESTARTED 1 -#define SCI_GAME_IS_RESTARTING_NOW 2 -#define SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE 4 - -struct drawn_pic_t { - int nr; - int palette; -}; - -// Savegame metadata -struct SavegameMetadata { - const char *savegame_name; - int savegame_version; - char *game_version; - sci_version_t version; - int savegame_date; - int savegame_time; -}; - -class FileHandle { -public: - Common::String _name; - Common::SeekableReadStream *_in; - Common::WriteStream *_out; - -public: - FileHandle(); - ~FileHandle(); - - void close(); - bool isOpen() const; -}; - -struct EngineState { - EngineState(); - - int savegame_version; - - int widget_serial_counter; /* Used for savegames */ - - ResourceManager *resmgr; /* The resource manager */ - - char *game_name; /* Designation of the primary object (which inherits from Game) */ - char *game_version; - - /* Non-VM information */ - - gfx_state_t *gfx_state; /* Graphics state and driver */ - gfx_pixmap_t *old_screen; /* Old screen content: Stored during kDrawPic() for kAnimate() */ - - sfx_state_t sound; /* sound subsystem */ - int sfx_init_flags; /* flags the sfx subsystem was initialised with */ - unsigned int sound_volume; /* 0x0 -> 0xf Current volume of sound system */ - unsigned int sound_mute; /* 0 = not, else == saved value */ - - byte restarting_flags; /* Flags used for restarting */ - byte have_mouse_flag; /* Do we have a hardware pointing device? */ - - byte pic_not_valid; /* Is 0 if the background picture is "valid" */ - byte pic_is_new; /* New pic was loaded or port was opened */ - byte onscreen_console; /* Use the onscreen console for debugging */ - byte *osc_backup; /* Backup of the pre-onscreen console screen data */ - - int *pic_priority_table; /* 16 entries with priorities or NULL if not present */ - - char *status_bar_text; /* Text on the status bar, or NULL if the title bar is blank */ - - int status_bar_foreground, status_bar_background; - - long game_time; /* Counted at 60 ticks per second, reset during start time */ - - reg_t save_dir_copy; /* Last copy of the save dir */ - int save_dir_edit_offset; /* For kEdit(): Display offset for editing the savedir */ - char *save_dir_copy_buf; /* Temp savedir buffer for kEdit() */ - - int mouse_pointer_view; /* Mouse pointer resource, or -1 if disabled */ - int mouse_pointer_loop; /* Mouse pointer resource, or -1 if disabled */ - int mouse_pointer_cel; /* Mouse pointer resource, or -1 if disabled */ - int save_mouse_pointer_view; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ - int save_mouse_pointer_loop; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ - int save_mouse_pointer_cel; /* Temporary storage for mouse pointer resource, when the pointer is hidden */ - - int port_serial; /* Port serial number, for save/restore */ - gfxw_port_t *port; /* The currently active port */ - - gfx_color_t ega_colors[16]; /* The 16 EGA colors- for SCI0(1) */ - - gfxw_visual_t *visual; /* A visual widget, containing all ports */ - - gfxw_port_t *titlebar_port; /* Title bar viewport (0,0,9,319) */ - gfxw_port_t *wm_port; /* window manager viewport and designated &heap[0] view (10,0,199,319) */ - gfxw_port_t *picture_port; /* The background picture viewport (10,0,199,319) */ - gfxw_port_t *iconbar_port; /* Full-screen port used for non-clipped icon bar draw in SCI1 */ - - gfx_map_mask_t pic_visible_map; /* The number of the map to display in update commands */ - int pic_animate; /* The animation used by Animate() to display the picture */ - - int dyn_views_list_serial; /* Used for save/restore */ - gfxw_list_t *dyn_views; /* Pointers to pic and dynamic view lists */ - - int drop_views_list_serial; /* Used for save/restore */ - gfxw_list_t *drop_views; /* A list Animate() can dump dropped dynviews into */ - - long animation_delay; /* A delay factor for pic opening animations. Defaults to 500. */ - int animation_granularity; /* Number of animation steps to perform betwen updates for transition animations */ - - menubar_t *menubar; /* The menu bar */ - - int priority_first; /* The line where priority zone 0 ends */ - int priority_last; /* The line where the highest priority zone starts */ - - int pics_drawn_nr; - int pics_nr; - drawn_pic_t *pics; - - uint32 game_start_time; /* The time at which the interpreter was started */ - uint32 last_wait_time; /* The last time the game invoked Wait() */ - - byte version_lock_flag; /* Set to 1 to disable any autodetection mechanisms */ - sci_version_t version; /* The approximated patchlevel of the version to emulate */ - sci_version_t max_version, min_version; /* Used for autodetect sanity checks */ - - unsigned int kernel_opt_flags; /* Kernel optimization flags- used for performance tweaking */ - - /* Kernel File IO stuff */ - - Common::Array _fileHandles; /* Array of file handles. Dynamically increased if required. */ - - DirSeeker _dirseeker; - - /* VM Information */ - - exec_stack_t *execution_stack; /* The execution stack */ - int execution_stack_size; /* Number of stack frames allocated */ - int execution_stack_pos; /* Position on the execution stack */ - int execution_stack_base; /* When called from kernel functions, the vm - ** is re-started recursively on the same stack. - ** This variable contains the stack base for the - ** current vm. - */ - int execution_stack_pos_changed; /* Set to 1 if the execution stack position - ** should be re-evaluated by the vm - */ - - reg_t r_acc; /* Accumulator */ - unsigned int r_amp_rest; /* &rest register (only used for save games) */ - reg_t r_prev; /* previous comparison result */ - - seg_id_t stack_segment; /* Heap area for the stack to use */ - stack_ptr_t stack_base; /* Pointer to the least stack element */ - stack_ptr_t stack_top; /* First invalid stack element */ - - seg_id_t parser_segment; /* A heap area used by the parser for error reporting */ - reg_t parser_base; /* Base address for the parser error reporting mechanism */ - reg_t parser_event; /* The event passed to Parse() and later used by Said() */ - seg_id_t script_000_segment; - script_t *script_000; /* script 000, e.g. for globals */ - - int parser_lastmatch_word; /* Position of the input word the parser last matched on, or SAID_NO_MATCH */ - - /* Debugger data: */ - breakpoint_t *bp_list; /* List of breakpoints */ - int have_bp; /* Bit mask specifying which types of breakpoints are used in bp_list */ - unsigned int debug_mode; /* Contains flags for the various debug modes */ - - /* System strings */ - seg_id_t sys_strings_segment; - SystemStrings *sys_strings; - - /* Parser data: */ - word_t **parser_words; - int parser_words_nr; - suffix_t **parser_suffices; - int parser_suffices_nr; - parse_tree_branch_t *parser_branches; - parse_rule_list_t *parser_rules; /* GNF rules used in the parser algorithm */ - int parser_branches_nr; - parse_tree_node_t parser_nodes[VOCAB_TREE_NODES]; /* The parse tree */ - - int parser_valid; /* If something has been correctly parsed */ - - synonym_t *synonyms; /* The list of synonyms */ - int synonyms_nr; - - reg_t game_obj; /* Pointer to the game object */ - - int classtable_size; /* Number of classes in the table- for debugging */ - class_t *classtable; /* Table of all classes */ - - SegManager *seg_manager; - int gc_countdown; /* Number of kernel calls until next gc */ - - Common::StringList _selectorNames; - int kernel_names_nr; /* Number of kernel function names */ - char **kernel_names; /* List of kernel names */ - - kfunct_sig_pair_t *kfunct_table; /* Table of kernel functions */ - int kfunct_nr; /* Number of mapped kernel functions; may be more than - ** kernel_names_nr */ - - opcode *opcodes; - - selector_map_t selector_map; /* Shortcut list for important selectors */ - - EngineState *successor; /* Successor of this state: Used for restoring */ -}; - - -#define STATE_T_DEFINED - -int gamestate_save(EngineState *s, Common::WriteStream *save, const char *savename); -/* Saves a game state to the hard disk in a portable way -** Parameters: (EngineState *) s: The state to save -** (WriteStream *) save: The stream to save to -** (char *) savename: The description of the savegame -** Returns : (int) 0 on success, 1 otherwise -*/ - -EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *save); -/* Restores a game state from a directory -** Parameters: (EngineState *) s: An older state from the same game -** (char *) dirname: The subdirectory to restore from -** Returns : (EngineState *) NULL on failure, a pointer to a valid EngineState otherwise -*/ - -bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata* meta); -/* Read the header from a savegame -*/ - -gfx_pixmap_color_t *get_pic_color(EngineState *s, int color); -/* Retrieves the gfx_pixmap_color_t associated with a game color index -** Parameters: (EngineState *) s: The game state -** (int) color: The color to look up -** Returns : (gfx_pixmap_color_t *) The requested color. -*/ - -static inline reg_t not_register(EngineState *s, reg_t r) { - if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE) - return make_reg(0, !r.offset); - else - return r; -} - -} // End of namespace Sci - -#endif // SCI_INCLUDE_ENGINE_H 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 { -- cgit v1.2.3