[Scummvm-cvs-logs] SF.net SVN: scummvm: [31080] scummvm/trunk/engines/scumm
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Mar 9 10:28:10 CET 2008
Revision: 31080
http://scummvm.svn.sourceforge.net/scummvm/?rev=31080&view=rev
Author: Kirben
Date: 2008-03-09 01:28:10 -0800 (Sun, 09 Mar 2008)
Log Message:
-----------
Add hack to skip the faulty credits script in Russian HE99 version of Freddi Fish 3.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/detection_tables.h
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/scumm.h
Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h 2008-03-09 09:20:16 UTC (rev 31079)
+++ scummvm/trunk/engines/scumm/detection_tables.h 2008-03-09 09:28:10 UTC (rev 31080)
@@ -295,9 +295,11 @@
{"baseball", "", 0, GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
{"thinkerk", "", 0, GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
{"thinker1", "", 0, GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
- {"freddi3", "", 0, GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
{"spyfox", "", 0, GID_HEGAME, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
+ {"freddi3", "", 0, GID_FREDDI3, 6, 90, MDT_NONE, GF_USE_KEY, UNK},
+ {"freddi3", "HE 99", 0, GID_FREDDI3, 6, 99, MDT_NONE, GF_USE_KEY, UNK},
+
// Humongous Entertainment Scumm Version 9.5 ? Scummsys.95
{"pajama2", "", 0, GID_HEGAME, 6, 95, MDT_NONE, GF_USE_KEY, UNK},
{"chase", "", 0, GID_HEGAME, 6, 95, MDT_NONE, GF_USE_KEY, UNK},
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2008-03-09 09:20:16 UTC (rev 31079)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2008-03-09 09:28:10 UTC (rev 31080)
@@ -792,6 +792,14 @@
getStackList(args, ARRAYSIZE(args));
script = pop();
flags = fetchScriptByte();
+
+ // HACK: The credits script in Russian HE99 version of Freddi Fish 3
+ // uses null strings, causing various errors, so skip it.
+ if (_game.id == GID_FREDDI3 && _game.heversion == 99 && _language == Common::RU_RUS &&
+ _currentRoom == 40 && script == 2057) {
+ return;
+ }
+
runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
}
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2008-03-09 09:20:16 UTC (rev 31079)
+++ scummvm/trunk/engines/scumm/scumm.h 2008-03-09 09:28:10 UTC (rev 31080)
@@ -220,6 +220,7 @@
GID_PUTTDEMO,
GID_FBEAR,
GID_FUNPACK,
+ GID_FREDDI3,
GID_WATER,
GID_PUTTRACE,
GID_FUNSHOP, // Used for all three funshops
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