[Scummvm-cvs-logs] SF.net SVN: scummvm:[50521] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Jun 30 11:51:22 CEST 2010
Revision: 50521
http://scummvm.svn.sourceforge.net/scummvm/?rev=50521&view=rev
Author: thebluegr
Date: 2010-06-30 09:51:21 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
SCI: Reverting r50516, SSCI didn't reset the node value when deleting the node. Also, a slight fix in VM debug code.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/klists.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp 2010-06-30 09:47:04 UTC (rev 50520)
+++ scummvm/trunk/engines/sci/engine/klists.cpp 2010-06-30 09:51:21 UTC (rev 50521)
@@ -346,12 +346,11 @@
if (!n->succ.isNull())
s->_segMan->lookupNode(n->succ)->pred = n->pred;
- // Erase the node itself, as the game might reference it again.
- // Happens in the intro of QFG1 and in Longbow, when exiting the
- // cave.
+ // Erase references to the predecessor and successor nodes, as the game
+ // scripts could reference the node itself again.
+ // Happens in the intro of QFG1 and in Longbow, when exiting the cave.
n->pred = NULL_REG;
n->succ = NULL_REG;
- n->value = NULL_REG;
return make_reg(0, 1); // Signal success
}
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2010-06-30 09:47:04 UTC (rev 50520)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2010-06-30 09:51:21 UTC (rev 50521)
@@ -815,7 +815,7 @@
#if 0
// Used for debugging
Common::String debugMsg = kernelFunc.origName +
- Common::String::printf("[0x%x]", kernelFuncNum) +
+ Common::String::printf("[0x%x]", kernelFuncNr) +
Common::String::printf(", %d params: ", argc) +
" (";
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