Implement sfWaitFramesEsc()

svn-id: r18894
This commit is contained in:
Eugene Sandulenko 2005-09-28 15:41:21 +00:00
parent afe28a5b07
commit 05ccf63898
6 changed files with 15 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* ScummVM - Scumm Interpreter
/* ScummVM - Scumm nterpreter
* Copyright (C) 2004-2005 The ScummVM project
*
* The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
@ -104,6 +104,7 @@ int SagaEngine::processInput() {
// Actual game keys
case 32: // space
_actor->abortSpeech();
_scene->cutawaySkip();
break;
case 19: // pause
case 'z':

View File

@ -329,6 +329,9 @@ bool Interface::processAscii(uint16 ascii, bool synthetic) {
processStatusTextInput(ascii);
return true;
}
_vm->_scene->cutawaySkip();
switch (_panelMode) {
case kPanelNull:
if (ascii == 27) { // Esc

View File

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

View File

@ -29,6 +29,7 @@
#include "saga/font.h"
#include "saga/list.h"
#include "saga/actor.h"
#include "saga/script.h"
namespace Saga {
@ -263,6 +264,12 @@ class Scene {
int currentSceneNumber() const { return _sceneNumber; }
int getOutsetSceneNumber() const { return _outsetSceneNumber; }
int currentSceneResourceId() const { return _sceneResourceId; }
void cutawaySkip() {
if (_vm->_scene->isInIntro())
_vm->_script->_framesEsc = 2;
else
_vm->_script->_framesEsc = 1;
}
void drawTextList(Surface *ds);
private:

View File

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

View File

@ -1982,9 +1982,7 @@ void Script::sfDebugShowData(SCRIPTFUNC_PARAMS) {
}
void Script::sfWaitFramesEsc(SCRIPTFUNC_PARAMS) {
thread->_returnValue = 0;
debug(0, "STUB: sfWaitFramesEsc()");
thread->_returnValue = _framesEsc;
}
void Script::sf103(SCRIPTFUNC_PARAMS) {