[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.135,1.136 saga.h,1.124,1.125 scene.h,1.77,1.78 script.h,1.108,1.109 sfuncs.cpp,1.163,1.164
Eugene Sandulenko
sev at users.sourceforge.net
Wed Sep 28 08:51:22 CEST 2005
- Previous message: [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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352
Modified Files:
saga.cpp saga.h scene.h script.h sfuncs.cpp
Log Message:
Cleaner code for sfWaitFramesEsc()
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- saga.cpp 28 Sep 2005 15:41:21 -0000 1.135
+++ saga.cpp 28 Sep 2005 15:49:20 -0000 1.136
@@ -294,7 +294,7 @@
load(fileName);
_interface->setMode(kPanelMain);
} else {
- _script->_framesEsc = 0;
+ _framesEsc = 0;
_scene->startScene();
}
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- saga.h 26 Sep 2005 07:22:32 -0000 1.124
+++ saga.h 28 Sep 2005 15:49:20 -0000 1.125
@@ -570,6 +570,8 @@
return isSaveListFull() ? _saveFilesCount : _saveFilesCount + 1;
}
+ bool _framesEsc;
+
uint32 _globalFlags;
byte _ethicsPoints[5]; // TODO: Verify that this is large enough
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- scene.h 28 Sep 2005 15:41:21 -0000 1.77
+++ scene.h 28 Sep 2005 15:49:20 -0000 1.78
@@ -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 @@
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);
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- script.h 28 Sep 2005 15:41:21 -0000 1.108
+++ script.h 28 Sep 2005 15:49:20 -0000 1.109
@@ -427,7 +427,6 @@
bool _skipSpeeches;
bool _abortEnabled;
- bool _framesEsc;
VoiceLUT _globalVoiceLUT;
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- sfuncs.cpp 28 Sep 2005 15:41:21 -0000 1.163
+++ sfuncs.cpp 28 Sep 2005 15:49:20 -0000 1.164
@@ -1982,7 +1982,7 @@
}
void Script::sfWaitFramesEsc(SCRIPTFUNC_PARAMS) {
- thread->_returnValue = _framesEsc;
+ thread->_returnValue = _vm->_framesEsc;
}
void Script::sf103(SCRIPTFUNC_PARAMS) {
- Previous message: [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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list