[Scummvm-cvs-logs] scummvm master -> fad30af04566ac40c1b210100ed2a87a69c760c9
Strangerke
Strangerke at scummvm.org
Wed May 1 15:40:39 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fad30af045 HOPKINS: Fix bug#3612110 - Script bug in FBI lab
Commit: fad30af04566ac40c1b210100ed2a87a69c760c9
https://github.com/scummvm/scummvm/commit/fad30af04566ac40c1b210100ed2a87a69c760c9
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-01T06:38:59-07:00
Commit Message:
HOPKINS: Fix bug#3612110 - Script bug in FBI lab
Changed paths:
engines/hopkins/script.cpp
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 941f234..5bc2890 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -48,6 +48,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
int vbobFrameIndex = 0;
uint32 signature24 = READ_BE_UINT24(&dataP[2]);
+ warning("%c%c%c", dataP[2], dataP[3], dataP[4]);
switch (signature24) {
case MKTAG24('T', 'X', 'T'): {
vbobFrameIndex = dataP[6];
@@ -198,6 +199,12 @@ int ScriptManager::handleOpcode(const byte *dataP) {
break;
case MKTAG24('S', 'T', 'P'):
if (!_vm->_objectsMan->_disableFl) {
+ // HACK: This piece of code is a replacement to the missing STE opcode when entering the FBI lab.
+ if (_vm->_globals->_curRoomNum == 10) {
+ _vm->_globals->_prevScreenId = _vm->_globals->_screenId;
+ _vm->_globals->_saveData->_data[svLastPrevScreenId] = _vm->_globals->_screenId;
+ _vm->_globals->_screenId = _vm->_globals->_saveData->_data[svLastScreenId] = 10;
+ }
_vm->_objectsMan->_twoCharactersFl = false;
_vm->_objectsMan->_characterPos.x = READ_LE_INT16(dataP + 6);
_vm->_objectsMan->_characterPos.y = READ_LE_INT16(dataP + 8);
More information about the Scummvm-git-logs
mailing list