aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-04-27 09:39:52 +0000
committerPaweł Kołodziejski2003-04-27 09:39:52 +0000
commit33c600dde53c19a76297f2d3a2ffb4d1eb0d31f8 (patch)
tree69ba39c86e995af381b7fe06dc9b425542982045 /scumm/script.cpp
parenta94afe41200bcb20c3626ea04844da321fcd96f5 (diff)
downloadscummvm-rg350-33c600dde53c19a76297f2d3a2ffb4d1eb0d31f8.tar.gz
scummvm-rg350-33c600dde53c19a76297f2d3a2ffb4d1eb0d31f8.tar.bz2
scummvm-rg350-33c600dde53c19a76297f2d3a2ffb4d1eb0d31f8.zip
and more share code
svn-id: r7150
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 2423774954..6828c7c7ac 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -336,7 +336,6 @@ int Scumm::getVarOrDirectByte(byte mask) {
return readVar(fetchScriptByte());
else
return readVar(fetchScriptWord());
-
return fetchScriptByte();
}
@@ -346,7 +345,7 @@ int Scumm::getVarOrDirectWord(byte mask) {
return readVar(fetchScriptByte());
else
return readVar(fetchScriptWord());
- return fetchScriptWord();
+ return (int16)fetchScriptWord();
}
#ifndef BYPASS_COPY_PROT