aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/sci/engine/state.cpp4
-rw-r--r--engines/sci/engine/state.h4
-rw-r--r--engines/sci/sci.cpp4
4 files changed, 5 insertions, 9 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 9c8f255902..9f644dcd8e 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -717,7 +717,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
}
// FIXME: Do in-place loading at some point, instead of creating a new EngineState instance from scratch.
- retval = new EngineState(s->resMan, s->_kernel, s->_voc, s->_gui, s->_cursor, s->_flags);
+ retval = new EngineState(s->resMan, s->_kernel, s->_voc, s->_gui, s->_cursor);
// Copy some old data
retval->gfx_state = s->gfx_state;
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 13930d8a27..04dc6ccc83 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -29,8 +29,8 @@
namespace Sci {
-EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor, uint32 flags)
-: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _flags(flags), _dirseeker(this) {
+EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor)
+: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _cursor(cursor), _dirseeker(this) {
gfx_state = 0;
old_screen = 0;
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 7fae7e2316..9ee8d271e6 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -160,7 +160,7 @@ private:
struct EngineState : public Common::Serializable {
public:
- EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor, uint32 flags);
+ EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, SciGuiCursor *cursor);
virtual ~EngineState();
virtual void saveLoadWithSerializer(Common::Serializer &ser);
@@ -171,8 +171,6 @@ public:
Kernel *_kernel;
Vocabulary *_voc;
- const uint32 _flags; /**< Specific game flags */
-
Common::String _gameName; /**< Designation of the primary object (which inherits from Game) */
/* Non-VM information */
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index a12a729ed1..41c0719ef5 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -126,8 +126,6 @@ Common::Error SciEngine::run() {
// FIXME/TODO: Move some of the stuff below to init()
- const uint32 flags = getFlags();
-
_resMan = new ResourceManager();
if (!_resMan) {
@@ -142,7 +140,7 @@ Common::Error SciEngine::run() {
SciGuiCursor *cursor = new SciGuiCursor(_resMan, palette);
// We'll set the GUI below
- _gamestate = new EngineState(_resMan, _kernel, _vocabulary, NULL, cursor, flags);
+ _gamestate = new EngineState(_resMan, _kernel, _vocabulary, NULL, cursor);
// Gui change
//_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new