aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-11-16 20:52:57 +0000
committerPaweł Kołodziejski2003-11-16 20:52:57 +0000
commitd5eddef057f1e39c2685304502a7cf2753d5bb65 (patch)
tree27db48606bf0c6402b6cf9c0f13df5235b929fc2 /scumm/script_v2.cpp
parenta169876a2f450eb022fb35ad16f3546ee4003f38 (diff)
downloadscummvm-rg350-d5eddef057f1e39c2685304502a7cf2753d5bb65.tar.gz
scummvm-rg350-d5eddef057f1e39c2685304502a7cf2753d5bb65.tar.bz2
scummvm-rg350-d5eddef057f1e39c2685304502a7cf2753d5bb65.zip
changed some shift operators to *, /
svn-id: r11315
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 501f5689af..fcb1ec7002 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -743,10 +743,10 @@ void ScummEngine_v2::o2_drawObject() {
od = &_objs[idx];
if (xpos != 0xFF) {
- od->walk_x += (xpos << 3) - od->x_pos;
- od->x_pos = xpos << 3;
- od->walk_y += (ypos << 3) - od->y_pos;
- od->y_pos = ypos << 3;
+ od->walk_x += (xpos * 8) - od->x_pos;
+ od->x_pos = xpos * 8;
+ od->walk_y += (ypos * 8) - od->y_pos;
+ od->y_pos = ypos * 8;
}
addObjectToDrawQue(idx);
@@ -819,8 +819,8 @@ void ScummEngine_v2::o2_verbOps() {
break;
default: { // New Verb
- int x = fetchScriptByte() << 3;
- int y = fetchScriptByte() << 3;
+ int x = fetchScriptByte() * 8;
+ int y = fetchScriptByte() * 8;
slot = getVarOrDirectByte(PARAM_1) + 1;
int prep = fetchScriptByte(); // Only used in V1?
// V1 Maniac verbs are relative to the 'verb area' - under the sentence
@@ -1496,10 +1496,10 @@ void ScummEngine_v2::o2_setObjectName() {
}
while (i < size) {
- work[i-1] = '@';
+ work[i - 1] = '@';
i++;
}
- work[i-1] = 0;
+ work[i - 1] = 0;
memcpy(name, work, i);
runInventoryScript(0);