diff options
| author | Walter van Niftrik | 2010-01-29 22:51:22 +0000 |
|---|---|---|
| committer | Walter van Niftrik | 2010-01-29 22:51:22 +0000 |
| commit | 67035764524d98d3f528c75217db5db231fa788e (patch) | |
| tree | 9c3baa4d12fd181167ec23ad076c78c366a26365 | |
| parent | 595a2e16f15ce73fe7c7ae0a31f33ca760356ff0 (diff) | |
| download | scummvm-rg350-67035764524d98d3f528c75217db5db231fa788e.tar.gz scummvm-rg350-67035764524d98d3f528c75217db5db231fa788e.tar.bz2 scummvm-rg350-67035764524d98d3f528c75217db5db231fa788e.zip | |
SCI: Partly revert r47597, as it is superseded by r47683.
svn-id: r47686
| -rw-r--r-- | engines/sci/engine/vm.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 3ce0caa976..8b688858d9 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -88,10 +88,8 @@ static StackPtr validate_stack_addr(EngineState *s, StackPtr sp) { 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 validate_arithmetic(reg_t reg) { 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) |