[Scummvm-cvs-logs] SF.net SVN: scummvm:[47686] scummvm/trunk/engines/sci/engine/vm.cpp

[waltervn at users.sourceforge.net]

Revision: 47686
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47686&view=rev
Author:   waltervn
Date:     2010-01-29 22:51:22 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
SCI: Partly revert r47597, as it is superseded by r47683.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-29 22:43:23 UTC (rev 47685)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-29 22:51:22 UTC (rev 47686)
@@ -88,10 +88,8 @@
 
 static int validate_arithmetic(reg_t reg) {
 	if (reg.segment) {
-		// When using a pointer in number arithmetic, we substitute a large value as
-		// some scripts rely on this (cf. Hoyle hack in kAbs).
 		warning("[VM] Attempt to read arithmetic value from non-zero segment [%04x]", reg.segment);
-		return 0x3e9;
+		return 0;
 	}
 
 	return reg.offset;
@@ -100,7 +98,7 @@
 static int signed_validate_arithmetic(reg_t reg) {
 	if (reg.segment) {
 		warning("[VM] Attempt to read arithmetic value from non-zero segment [%04x]", reg.segment);
-		return 0x3e9;
+		return 0;
 	}
 
 	if (reg.offset & 0x8000)


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