[Scummvm-cvs-logs] SF.net SVN: scummvm:[40033] scummvm/trunk/engines/scumm/script_v5.cpp

[Kirben at users.sourceforge.net]

Revision: 40033
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40033&view=rev
Author:   Kirben
Date:     2009-04-21 04:42:45 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
Fix regression in SCUMM0, by calling ScummEngine::fetchScriptWord() directly. Since fetchScriptWordSigned(), still uses the overloaded fetchScriptWord() function.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v5.cpp

Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp	2009-04-20 19:28:55 UTC (rev 40032)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2009-04-21 04:42:45 UTC (rev 40033)
@@ -378,11 +378,7 @@
 }
 
 void ScummEngine_v5::jumpRelative(bool cond) {
-	// We explicitly call ScummEngine::fetchScriptWordSigned()
-	// to make this method work also in v0, which overloads
-	// fetchScriptWord to only read bytes (which is the right thing
-	// to do for most opcodes, but not for jump offsets).
-	int16 offset = ScummEngine::fetchScriptWordSigned();
+	int16 offset = ScummEngine::fetchScriptWord();
 	if (!cond)
 		_scriptPointer += offset;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.