[Scummvm-cvs-logs] SF.net SVN: scummvm:[51472] scummvm/trunk/engines/sci/engine/script.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jul 29 17:50:53 CEST 2010
Revision: 51472
http://scummvm.svn.sourceforge.net/scummvm/?rev=51472&view=rev
Author: thebluegr
Date: 2010-07-29 15:50:53 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
SCI: Removed the language check from the
KQ5 workaround, as there could be an issue
with other non-English versions, too (e.g.
the Spanish floppy version)
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/script.cpp
Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp 2010-07-29 15:40:09 UTC (rev 51471)
+++ scummvm/trunk/engines/sci/engine/script.cpp 2010-07-29 15:50:53 UTC (rev 51472)
@@ -474,10 +474,10 @@
obj->initSpecies(segMan, addr);
if (!obj->initBaseObject(segMan, addr)) {
- if (_nr == 202 && g_sci->getGameId() == GID_KQ5 &&
- (g_sci->getSciLanguage() == K_LANG_FRENCH || g_sci->getSciLanguage() == K_LANG_GERMAN)) {
- // WORKAROUND: Script 202 of KQ5 French and German has an invalid object. This is non-fatal.
- // Refer to bug #3035396.
+ if (_nr == 202 && g_sci->getGameId() == GID_KQ5) {
+ // WORKAROUND: Script 202 of KQ5 French and German
+ // (perhaps Spanish too?) has an invalid object.
+ // This is non-fatal. Refer to bug #3035396.
} else {
error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
}
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