[Scummvm-cvs-logs] SF.net SVN: scummvm:[52182] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Aug 18 09:14:18 CEST 2010
Revision: 52182
http://scummvm.svn.sourceforge.net/scummvm/?rev=52182&view=rev
Author: thebluegr
Date: 2010-08-18 07:14:17 +0000 (Wed, 18 Aug 2010)
Log Message:
-----------
SCI: Fixed bug #3038433 - "HOYLE1: Crashes"
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/klists.cpp
scummvm/trunk/engines/sci/engine/workarounds.cpp
Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp 2010-08-18 06:59:31 UTC (rev 52181)
+++ scummvm/trunk/engines/sci/engine/klists.cpp 2010-08-18 07:14:17 UTC (rev 52182)
@@ -40,6 +40,9 @@
if ((g_sci->getGameId() == GID_ICEMAN) && (g_sci->getEngineState()->currentRoomNumber() == 40)) {
// ICEMAN: when plotting course, unDrawLast is called by startPlot::changeState
// there is no previous entry so we get 0 in here
+ } else if ((g_sci->getGameId() == GID_HOYLE1) && (g_sci->getEngineState()->currentRoomNumber() == 3)) {
+ // HOYLE1: after sorting cards in hearts, in the next round
+ // we get an invalid node - bug #3038433
} else {
error("isSaneNodePointer: Node at %04x:%04x wasn't found", PRINT_REG(addr));
}
Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp 2010-08-18 06:59:31 UTC (rev 52181)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp 2010-08-18 07:14:17 UTC (rev 52182)
@@ -48,6 +48,7 @@
// gameID, room,script,lvl, object-name, method-name, call,index, workaround
const SciWorkaroundEntry opcodeGeWorkarounds[] = {
+ { GID_HOYLE1, 5, 213, 0, "", "export 0", -1, 0, { WORKAROUND_FAKE, 1 } }, // happens sometimes during cribbage - bug #3038433
{ GID_PQ3, 31, 31, 0, "rm031", "init", -1, 0, { WORKAROUND_FAKE, 1 } }, // pq3 english: when exiting the car, while morales is making phonecalls - bug #3037565
SCI_WORKAROUNDENTRY_TERMINATOR
};
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