diff options
| -rw-r--r-- | saga/saga.cpp | 2 | ||||
| -rw-r--r-- | saga/saga.h | 2 | ||||
| -rw-r--r-- | saga/scene.h | 5 | ||||
| -rw-r--r-- | saga/script.h | 1 | ||||
| -rw-r--r-- | saga/sfuncs.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp index 3f51ae601a..e861512fcb 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -294,7 +294,7 @@ int SagaEngine::go() { load(fileName); _interface->setMode(kPanelMain); } else { - _script->_framesEsc = 0; + _framesEsc = 0; _scene->startScene(); } diff --git a/saga/saga.h b/saga/saga.h index c8b928a06a..577c908a38 100644 --- a/saga/saga.h +++ b/saga/saga.h @@ -570,6 +570,8 @@ public: return isSaveListFull() ? _saveFilesCount : _saveFilesCount + 1; } + bool _framesEsc; + uint32 _globalFlags; byte _ethicsPoints[5]; // TODO: Verify that this is large enough diff --git a/saga/scene.h b/saga/scene.h index 03f557c812..d446555f23 100644 --- a/saga/scene.h +++ b/saga/scene.h @@ -29,7 +29,6 @@ #include "saga/font.h" #include "saga/list.h" #include "saga/actor.h" -#include "saga/script.h" namespace Saga { @@ -266,9 +265,9 @@ class Scene { int currentSceneResourceId() const { return _sceneResourceId; } void cutawaySkip() { if (_vm->_scene->isInIntro()) - _vm->_script->_framesEsc = 2; + _vm->_framesEsc = 2; else - _vm->_script->_framesEsc = 1; + _vm->_framesEsc = 1; } void drawTextList(Surface *ds); diff --git a/saga/script.h b/saga/script.h index 4b3f82a773..d35fbd7333 100644 --- a/saga/script.h +++ b/saga/script.h @@ -427,7 +427,6 @@ public: bool _skipSpeeches; bool _abortEnabled; - bool _framesEsc; VoiceLUT _globalVoiceLUT; diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 7ca39dabb1..d3ec186d8c 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -1982,7 +1982,7 @@ void Script::sfDebugShowData(SCRIPTFUNC_PARAMS) { } void Script::sfWaitFramesEsc(SCRIPTFUNC_PARAMS) { - thread->_returnValue = _framesEsc; + thread->_returnValue = _vm->_framesEsc; } void Script::sf103(SCRIPTFUNC_PARAMS) { |