[Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.51,1.52 interface.cpp,1.137,1.138 saga.cpp,1.134,1.135 scene.h,1.76,1.77 script.h,1.107,1.108 sfuncs.cpp,1.162,1.163

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7927

Modified Files:
	input.cpp interface.cpp saga.cpp scene.h script.h sfuncs.cpp 
Log Message:
Implement sfWaitFramesEsc()


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- input.cpp	11 Aug 2005 16:13:10 -0000	1.51
+++ input.cpp	28 Sep 2005 15:41:21 -0000	1.52
@@ -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 @@
 			// Actual game keys
 			case 32: // space
 				_actor->abortSpeech();
+				_scene->cutawaySkip();
 				break;
 			case 19:  // pause
 			case 'z':

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- interface.cpp	2 Sep 2005 20:17:52 -0000	1.137
+++ interface.cpp	28 Sep 2005 15:41:21 -0000	1.138
@@ -329,6 +329,9 @@
 		processStatusTextInput(ascii);
 		return true;
 	}
+
+	_vm->_scene->cutawaySkip();
+
 	switch (_panelMode) {
 	case kPanelNull:
 		if (ascii == 27) { // Esc

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- saga.cpp	26 Sep 2005 07:22:32 -0000	1.134
+++ saga.cpp	28 Sep 2005 15:41:21 -0000	1.135
@@ -294,6 +294,7 @@
 		load(fileName);
 		_interface->setMode(kPanelMain);
 	} else {
+		_script->_framesEsc = 0;
 		_scene->startScene();
 	}
 

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- scene.h	23 Sep 2005 14:29:26 -0000	1.76
+++ scene.h	28 Sep 2005 15:41:21 -0000	1.77
@@ -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 @@
 	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:

Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- script.h	25 Sep 2005 00:08:13 -0000	1.107
+++ script.h	28 Sep 2005 15:41:21 -0000	1.108
@@ -427,6 +427,7 @@
 
 	bool _skipSpeeches;
 	bool _abortEnabled;
+	bool _framesEsc;
 
 	VoiceLUT _globalVoiceLUT;
 

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- sfuncs.cpp	28 Sep 2005 06:33:13 -0000	1.162
+++ sfuncs.cpp	28 Sep 2005 15:41:21 -0000	1.163
@@ -1982,9 +1982,7 @@
 }
 
 void Script::sfWaitFramesEsc(SCRIPTFUNC_PARAMS) {
-	thread->_returnValue = 0;
-
-	debug(0, "STUB: sfWaitFramesEsc()");
+	thread->_returnValue = _framesEsc;
 }
 
 void Script::sf103(SCRIPTFUNC_PARAMS) {