[Scummvm-cvs-logs] SF.net SVN: scummvm: [27385] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Jun 13 15:00:26 CEST 2007
Revision: 27385
http://scummvm.svn.sourceforge.net/scummvm/?rev=27385&view=rev
Author: thebluegr
Date: 2007-06-13 06:00:25 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
IHNM: Fixed sfSetSpeechBox, now the dialog of Nimdok and Mengele will show up correctly. Also, done some preliminary work on sfScriptGotoScene and changeScene to return to the character selection screen, but it's not right yet
Modified Paths:
--------------
scummvm/trunk/engines/saga/scene.cpp
scummvm/trunk/engines/saga/sfuncs.cpp
Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp 2007-06-13 12:58:20 UTC (rev 27384)
+++ scummvm/trunk/engines/saga/scene.cpp 2007-06-13 13:00:25 UTC (rev 27385)
@@ -477,6 +477,12 @@
if (sceneNumber != -2) {
endScene();
}
+
+ if (sceneParams.sceneDescriptor == -1 && _vm->getGameType() == GType_IHNM) {
+ sceneParams.chapter = 8;
+ sceneParams.sceneDescriptor = 152;
+ }
+
loadScene(&sceneParams);
}
Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp 2007-06-13 12:58:20 UTC (rev 27384)
+++ scummvm/trunk/engines/saga/sfuncs.cpp 2007-06-13 13:00:25 UTC (rev 27385)
@@ -544,12 +544,18 @@
void Script::sfScriptGotoScene(SCRIPTFUNC_PARAMS) {
int16 sceneNumber;
int16 entrance;
+ int16 transition = 0; // IHNM
sceneNumber = thread->pop();
entrance = thread->pop();
+ if (_vm->getGameType() == GType_IHNM)
+ transition = thread->pop();
+
if (sceneNumber < 0) {
- _vm->shutDown();
- return;
+ if (_vm->getGameType() == GType_ITE) {
+ _vm->shutDown();
+ return;
+ }
}
if (_vm->getGameType() == GType_IHNM) {
@@ -2053,8 +2059,8 @@
_vm->_actor->_speechBoxScript.left = param1;
_vm->_actor->_speechBoxScript.top = param2;
- _vm->_actor->_speechBoxScript.setWidth(param3);
- _vm->_actor->_speechBoxScript.setHeight(param4);
+ _vm->_actor->_speechBoxScript.setWidth(param3 - param1);
+ _vm->_actor->_speechBoxScript.setHeight(param4 - param2);
}
void Script::sfDebugShowData(SCRIPTFUNC_PARAMS) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list