diff options
| author | Arnaud Boutonné | 2010-10-24 20:36:47 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-10-24 20:36:47 +0000 |
| commit | cb6efae5afef01034544f7f9ac9da98cd44e3475 (patch) | |
| tree | 853821e4e643097905fff6dfd915869172cc2749 /engines/gob | |
| parent | e3ea3b5b7e6f1fbb20d9f958476e5a2263af7052 (diff) | |
| download | scummvm-rg350-cb6efae5afef01034544f7f9ac9da98cd44e3475.tar.gz scummvm-rg350-cb6efae5afef01034544f7f9ac9da98cd44e3475.tar.bz2 scummvm-rg350-cb6efae5afef01034544f7f9ac9da98cd44e3475.zip | |
GOB: Replace strncmp by scumm_stricmp when possible
svn-id: r53774
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/inter.cpp | 20 | ||||
| -rw-r--r-- | engines/gob/util.cpp | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index c86d3d2642..8db42b217c 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -268,23 +268,23 @@ void Inter::funcBlock(int16 retFlag) { int addr = _vm->_game->_script->pos(); if ((startaddr == 0x18B4 && addr == 0x1A7F && // Zombie, EGA - !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt005.tot")) || (startaddr == 0x188D && addr == 0x1A58 && // Zombie, Mac - !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt005.tot")) || (startaddr == 0x1299 && addr == 0x139A && // Dungeon - !strncmp(_vm->_game->_curTotFile, "avt006.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt006.tot")) || (startaddr == 0x11C0 && addr == 0x12C9 && // Cauldron, EGA - !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt012.tot")) || (startaddr == 0x11C8 && addr == 0x1341 && // Cauldron, Mac - !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt012.tot")) || (startaddr == 0x09F2 && addr == 0x0AF3 && // Statue - !strncmp(_vm->_game->_curTotFile, "avt016.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt016.tot")) || (startaddr == 0x0B92 && addr == 0x0C93 && // Castle - !strncmp(_vm->_game->_curTotFile, "avt019.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt019.tot")) || (startaddr == 0x17D9 && addr == 0x18DA && // Finale, EGA - !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10)) || + !scumm_stricmp(_vm->_game->_curTotFile, "avt022.tot")) || (startaddr == 0x17E9 && addr == 0x19A8 && // Finale, Mac - !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) { + !scumm_stricmp(_vm->_game->_curTotFile, "avt022.tot"))) { _vm->_util->longDelay(5000); } @@ -295,7 +295,7 @@ void Inter::funcBlock(int16 retFlag) { // of Fascination have a too short delay between the storage room and the lab. // We manually add it here. if ((_vm->getGameType() == kGameTypeFascination) && - !strncmp(_vm->_game->_curTotFile, "PLANQUE.tot", 9)) { + !scumm_stricmp(_vm->_game->_curTotFile, "PLANQUE.tot")) { int addr = _vm->_game->_script->pos(); if ((startaddr == 0x0202 && addr == 0x0330) || // Before Lab, Amiga & Atari, English (startaddr == 0x023D && addr == 0x032D) || // Before Lab, PC floppy, German diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index 9f0242f6d3..8e2b3d89cd 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -150,7 +150,7 @@ void Util::processInput(bool scroll) { // WORKAROUND: // Force a check of the mouse in order to fix the sofa bug. This apply only for Gob3, and only // in the impacted TOT file so that the second screen animation is not broken. - if ((_vm->getGameType() == kGameTypeGob3) && !strncmp(_vm->_game->_curTotFile, "EMAP1008.TOT", 12)) + if ((_vm->getGameType() == kGameTypeGob3) && !scumm_stricmp(_vm->_game->_curTotFile, "EMAP1008.TOT")) _vm->_game->evaluateScroll(); } } |