aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.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_v5.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_v5.cpp')
-rw-r--r--scumm/script_v5.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 025597fce2..eee77f28ce 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -837,10 +837,10 @@ void ScummEngine_v5::o5_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);
@@ -1967,9 +1967,9 @@ void ScummEngine_v5::o5_roomOps() {
int len = 256, cnt = 0;
ptr = (byte *)malloc(len);
while (ptr) {
- int r = file->read(ptr+cnt, len-cnt);
+ int r = file->read(ptr + cnt, len - cnt);
if ((cnt += r) < len) break;
- ptr = (byte *)realloc(ptr, len<<=1);
+ ptr = (byte *)realloc(ptr, len *= 2);
}
ptr[cnt] = '\0';
loadPtrToResource(rtString, a, ptr);
@@ -2584,7 +2584,7 @@ void ScummEngine_v5::o5_wait() {
break;
return;
case 3: // SO_WAIT_FOR_CAMERA
- if (camera._cur.x >> 3 != camera._dest.x >> 3)
+ if (camera._cur.x / 8 != camera._dest.x / 8)
break;
return;
case 4: // SO_WAIT_FOR_SENTENCE