[Scummvm-cvs-logs] SF.net SVN: scummvm:[53774] scummvm/trunk/engines/gob
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Sun Oct 24 22:36:47 CEST 2010
Revision: 53774
http://scummvm.svn.sourceforge.net/scummvm/?rev=53774&view=rev
Author: strangerke
Date: 2010-10-24 20:36:47 +0000 (Sun, 24 Oct 2010)
Log Message:
-----------
GOB: Replace strncmp by scumm_stricmp when possible
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter.cpp
scummvm/trunk/engines/gob/util.cpp
Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp 2010-10-24 20:22:21 UTC (rev 53773)
+++ scummvm/trunk/engines/gob/inter.cpp 2010-10-24 20:36:47 UTC (rev 53774)
@@ -268,23 +268,23 @@
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 @@
// 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
Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp 2010-10-24 20:22:21 UTC (rev 53773)
+++ scummvm/trunk/engines/gob/util.cpp 2010-10-24 20:36:47 UTC (rev 53774)
@@ -150,7 +150,7 @@
// 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();
}
}
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