libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaner code for sfWaitFramesEsc()

Browse Source 
svn-id: r18895
This commit is contained in:
Eugene Sandulenko 2005-09-28 15:49:20 +00:00
parent 05ccf63898
commit fde99a029a
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
saga/saga.cpp
View File

@ -294,7 +294,7 @@ int SagaEngine::go() {
load(fileName);
_interface->setMode(kPanelMain);
} else {
_script->_framesEsc = 0;
_framesEsc = 0;
_scene->startScene();
}

2
saga/saga.h
View File

@ -570,6 +570,8 @@ public:
return isSaveListFull() ? _saveFilesCount : _saveFilesCount + 1;
}
bool _framesEsc;
uint32 _globalFlags;
byte _ethicsPoints[5]; // TODO: Verify that this is large enough

5
saga/scene.h
View File

@ -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);

1
saga/script.h
View File

@ -427,7 +427,6 @@ public:
bool _skipSpeeches;
bool _abortEnabled;
bool _framesEsc;
VoiceLUT _globalVoiceLUT;

2
saga/sfuncs.cpp
View File

@ -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) {