diff options
| author | Sven Hesse | 2011-01-29 22:45:51 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-29 22:45:51 +0000 |
| commit | ce3d4b5d1b06644a210fd7198373488ad4c8cdf4 (patch) | |
| tree | e358003d9216b4007e7fe69c08d7aba5d7f9e57d /engines/gob/inter_v1.cpp | |
| parent | 0c3a33c354c027ee238186794d96c3047d0a4ce2 (diff) | |
| download | scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.tar.gz scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.tar.bz2 scummvm-rg350-ce3d4b5d1b06644a210fd7198373488ad4c8cdf4.zip | |
GOB: Add GobEngine::isCurrentTot()
svn-id: r55630
Diffstat (limited to 'engines/gob/inter_v1.cpp')
| -rw-r--r-- | engines/gob/inter_v1.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 1cb7c264ae..23f9ea0a10 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -667,13 +667,13 @@ void Inter_v1::o1_callSub(OpFuncParams ¶ms) { // Skipping the copy protection screen in Gobliiins if (!_vm->_copyProtection && (_vm->getGameType() == kGameTypeGob1) && (offset == 3905) && - _vm->_game->_curTotFile.equalsIgnoreCase(_vm->_startTot)) { + _vm->isCurrentTot(_vm->_startTot)) { debugC(2, kDebugGameFlow, "Skipping copy protection screen"); return; } // Skipping the copy protection screen in Gobliins 2 if (!_vm->_copyProtection && (_vm->getGameType() == kGameTypeGob2) && (offset == 1746) && - _vm->_game->_curTotFile.equalsIgnoreCase("intro0.tot")) { + _vm->isCurrentTot("intro0.tot")) { debugC(2, kDebugGameFlow, "Skipping copy protection screen"); return; } @@ -809,7 +809,7 @@ void Inter_v1::o1_if(OpFuncParams ¶ms) { // WORKAROUND: Gob1 goblin stuck on reload bugs present in original - bugs #3018918 and 3065914 if ((_vm->getGameType() == kGameTypeGob1) && (_vm->_game->_script->pos() == 2933) && - _vm->_game->_curTotFile.equalsIgnoreCase("inter.tot") && VAR(285) != 0) { + _vm->isCurrentTot("inter.tot") && VAR(285) != 0) { warning("Workaround for Gob1 Goblin Stuck On Reload Bug applied..."); // VAR(59) actually locks goblin movement, but these variables trigger this in the script. WRITE_VAR(285, 0); @@ -888,7 +888,7 @@ void Inter_v1::o1_loadSpriteToPos(OpFuncParams ¶ms) { // WORKAROUND: The EGA version of Gobliiins 1 has an invalid expression there if (_vm->isEGA() && (_vm->_game->_script->pos() == 1398) && - _vm->_game->_curTotFile.equalsIgnoreCase("intro.tot")) { + _vm->isCurrentTot("intro.tot")) { _vm->_draw->_destSpriteY = 0; _vm->_game->_script->skip(1); @@ -1190,8 +1190,7 @@ void Inter_v1::o1_keyFunc(OpFuncParams ¶ms) { // to become 5000. We deliberately slow down busy-waiting, so we shorten // the counting, too. if ((_vm->getGameType() == kGameTypeWeen) && (VAR(59) < 4000) && - (_vm->_game->_script->pos() == 729) && - _vm->_game->_curTotFile.equalsIgnoreCase("intro5.tot")) + (_vm->_game->_script->pos() == 729) && _vm->isCurrentTot("intro5.tot")) WRITE_VAR(59, 4000); switch (cmd) { |