diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/gob/inter_v1.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/gob/inter_v1.cpp')
| -rw-r--r-- | engines/gob/inter_v1.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 0eb8be1a03..9aa190a456 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -658,20 +658,6 @@ void Inter_v1::o1_callSub(OpFuncParams ¶ms) { return; } - // A cheat to get around the stupid mastermind puzzle in Geisha, - // while we're still testing it - if ((_vm->getGameType() == kGameTypeGeisha) && (offset == 12934) && - _vm->isCurrentTot("hard.tot") && _vm->_inter->_variables) { - - uint32 digit1 = READ_VARO_UINT32(0x768); - uint32 digit2 = READ_VARO_UINT32(0x76C); - uint32 digit3 = READ_VARO_UINT32(0x770); - uint32 digit4 = READ_VARO_UINT32(0x774); - uint32 digit5 = READ_VARO_UINT32(0x778); - - warning("Mastermind solution: %d %d %d %d %d", digit1, digit2, digit3, digit4, digit5); - } - // Skipping the copy protection screen in Gobliiins if (!_vm->_copyProtection && (_vm->getGameType() == kGameTypeGob1) && (offset == 3905) && _vm->isCurrentTot(_vm->_startTot)) { @@ -945,7 +931,7 @@ void Inter_v1::o1_printText(OpFuncParams ¶ms) { case TYPE_VAR_INT32: case TYPE_ARRAY_INT32: sprintf(buf + i, "%d", - VAR_OFFSET(_vm->_game->_script->readVarIndex())); + (int32)VAR_OFFSET(_vm->_game->_script->readVarIndex())); break; case TYPE_VAR_STR: |