[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.186,1.187 akos.cpp,1.88,1.89 bomp.cpp,2.13,2.14 bundle.cpp,1.48,1.49 camera.cpp,2.17,2.18 costume.cpp,1.118,1.119 gfx.cpp,2.231,2.232 imuse.cpp,2.111,2.112 imuse_player.cpp,2.38,2.39 object.cpp,1.147,1.148 script_v2.cpp,2.214,2.215 script_v5.cpp,1.209,1.210 script_v6.cpp,1.210,1.211 string.cpp,1.166,1.167 verbs.cpp,1.81,1.82
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Nov 16 12:54:16 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.68,1.69
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec37.cpp,1.24,1.25 codec47.cpp,1.62,1.63 imuse_channel.cpp,1.22,1.23 smush_font.cpp,1.14,1.15 smush_player.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31504
Modified Files:
actor.cpp akos.cpp bomp.cpp bundle.cpp camera.cpp costume.cpp
gfx.cpp imuse.cpp imuse_player.cpp object.cpp script_v2.cpp
script_v5.cpp script_v6.cpp string.cpp verbs.cpp
Log Message:
changed some shift operators to *, /
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- actor.cpp 10 Nov 2003 00:28:09 -0000 1.186
+++ actor.cpp 16 Nov 2003 20:52:56 -0000 1.187
@@ -1045,7 +1045,7 @@
aksq = _vm->findResourceData(MKID('AKSQ'), akos);
akfo = _vm->findResourceData(MKID('AKFO'), akos);
- size = _vm->getResourceDataSize(akfo) >> 1;
+ size = _vm->getResourceDataSize(akfo) / 2;
while (f--) {
if (cost.active[limb] != 0)
@@ -1103,10 +1103,10 @@
int ScummEngine::getActorFromPos(int x, int y) {
int i;
- if (!testGfxAnyUsageBits(x >> 3))
+ if (!testGfxAnyUsageBits(x / 8))
return 0;
for (i = 1; i < _numActors; i++) {
- if (testGfxUsageBit(x >> 3, i) && !getClass(i, kObjectClassUntouchable)
+ if (testGfxUsageBit(x / 8, i) && !getClass(i, kObjectClassUntouchable)
&& y >= _actors[i].top && y <= _actors[i].bottom) {
if (_version > 2 || i != VAR(VAR_EGO))
return i;
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- akos.cpp 9 Oct 2003 14:17:05 -0000 1.88
+++ akos.cpp 16 Nov 2003 20:52:56 -0000 1.89
@@ -357,7 +357,7 @@
scaleytab = &v1.scaletable[v1.scaleYindex];
maskbit = revBitMask[v1.x & 7];
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
if (len)
goto StartPos;
@@ -418,7 +418,7 @@
skip_column = true;
v1.scaleXindex += v1.scaleXstep;
dst = v1.destptr;
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
}
StartPos:;
} while (--len);
@@ -1067,7 +1067,7 @@
aksq = findResourceData(MKID('AKSQ'), akos);
akfo = findResourceData(MKID('AKFO'), akos);
- size = getResourceDataSize(akfo) >> 1;
+ size = getResourceDataSize(akfo) / 2;
result = false;
for (i = 0; i < 16; i++) {
Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- bomp.cpp 3 Oct 2003 18:33:53 -0000 2.13
+++ bomp.cpp 16 Nov 2003 20:52:56 -0000 2.14
@@ -239,7 +239,7 @@
// Also mask against any additionally imposed mask
if (bd.maskPtr) {
- mask = bd.maskPtr + (bd.y * gdi._numStrips) + ((bd.x + clip_left) >> 3);
+ mask = bd.maskPtr + (bd.y * gdi._numStrips) + ((bd.x + clip_left) / 8);
}
// Setup vertical scaling
@@ -287,7 +287,7 @@
tmp = skip_y_new & skip_y_bits;
// Advance the scale-skip bit mask, if it's 0, get the next scale-skip byte
- skip_y_bits >>= 1;
+ skip_y_bits /= 2;
if (skip_y_bits == 0) {
skip_y_bits = 0x80;
skip_y_new = *scalingYPtr++;
@@ -357,11 +357,11 @@
byte ret_value = 0;
const int offsets[8] = { 3, 2, 1, 0, 7, 6, 5, 4 };
- count = (256 - (size >> 1));
+ count = (256 - size / 2);
assert(0 <= count && count < 768);
tmp_ptr = defaultScaleTable + count;
- count = (size + 7) >> 3;
+ count = (size + 7) / 8;
while (count--) {
a = 0;
for (int i = 0; i < 8; i++) {
@@ -379,7 +379,7 @@
*(tmp_scaling - 1) |= revBitMask[size & 7];
}
- count = (size + 7) >> 3;
+ count = (size + 7) / 8;
while (count--) {
tmp = *scaling++;
ret_value += bitCount[tmp];
Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- bundle.cpp 9 Oct 2003 14:17:05 -0000 1.48
+++ bundle.cpp 16 Nov 2003 20:52:56 -0000 1.49
@@ -125,10 +125,10 @@
int32 imcTable1Pos = 0;
do {
byte put = 1;
- int32 tableValue = ((imcTable[imcTable1Pos] << 2) / 7) >> 1;
+ int32 tableValue = ((imcTable[imcTable1Pos] * 4) / 7) / 2;
if (tableValue != 0) {
do {
- tableValue >>= 1;
+ tableValue /= 2;
put++;
} while (tableValue != 0);
}
@@ -155,8 +155,8 @@
if ((count & n) != 0) {
put += tableValue;
}
- count >>= 1;
- tableValue >>= 1;
+ count /= 2;
+ tableValue /= 2;
} while (count != 0);
_destImcTable2[destTablePos] = put;
destTablePos += 64;
@@ -526,13 +526,13 @@
s = 0;
j = 0;
do {
- ptr = src + length + (k >> 1);
+ ptr = src + length + k / 2;
if (k & 1) {
- r = c >> 3;
+ r = c / 8;
t_table[r + 2] = ((src[j] & 0x0f) << 4) | (ptr[1] >> 4);
t_table[r + 1] = (src[j] & 0xf0) | (t_table[r + 1]);
} else {
- r = s >> 3;
+ r = s / 8;
t_table[r + 0] = ((src[j] & 0x0f) << 4) | (ptr[0] & 0x0f);
t_table[r + 1] = src[j] >> 4;
}
@@ -569,13 +569,13 @@
j = 1;
if (t > k) {
do {
- ptr = src + length + (k >> 1);
+ ptr = src + length + k / 2;
if (k & 1) {
- r = c >> 3;
+ r = c / 8;
t_table[r + 0] = (src[j - 1] & 0xf0) | t_table[r];
t_table[r + 1] = ((src[j - 1] & 0x0f) << 4) | (ptr[0] & 0x0f);
} else {
- r = s >> 3;
+ r = s / 8;
t_table[r + 0] = src[j - 1] >> 4;
t_table[r - 1] = ((src[j - 1] & 0x0f) << 4) | (ptr[0] >> 4);
}
@@ -611,13 +611,13 @@
t = length - 1;
if (t > 0) {
do {
- ptr = src + length + (k >> 1);
+ ptr = src + length + k / 2;
if (k & 1) {
- r = s >> 3;
+ r = s / 8;
t_table[r + 2] = (src[j] & 0xf0) | *(t_table + r + 2);
t_table[r + 3] = ((src[j] & 0x0f) << 4) | (ptr[0] >> 4);
} else {
- r = c >> 3;
+ r = c / 8;
t_table[r + 2] = src[j] >> 4;
t_table[r + 1] = ((src[j] & 0x0f) << 4) | (ptr[0] & 0x0f);
}
@@ -663,15 +663,15 @@
c = -12;
s = 0;
do {
- j = length + (k >> 1);
+ j = length + k / 2;
if (k & 1) {
- r = c >> 3;
+ r = c / 8;
t_tmp1 = t_table[k];
t_tmp2 = t_table[j + 1];
src[r + 2] = ((t_tmp1 & 0x0f) << 4) | (t_tmp2 >> 4);
src[r + 1] = (src[r + 1]) | (t_tmp1 & 0xf0);
} else {
- r = s >> 3;
+ r = s / 8;
t_tmp1 = t_table[k];
t_tmp2 = t_table[j];
src[r + 0] = ((t_tmp1 & 0x0f) << 4) | (t_tmp2 & 0x0f);
@@ -722,15 +722,15 @@
t = length + k;
if (t > k) {
do {
- j = length + (k / 2);
+ j = length + k / 2;
if (k & 1) {
- r = c >> 3;
+ r = c / 8;
t_tmp1 = t_table[k - 1];
t_tmp2 = t_table[j];
src[r + 0] = (src[r]) | (t_tmp1 & 0xf0);
src[r + 1] = ((t_tmp1 & 0x0f) << 4) | (t_tmp2 & 0x0f);
} else {
- r = s >> 3;
+ r = s / 8;
t_tmp1 = t_table[k - 1];
t_tmp2 = t_table[j];
src[r + 0] = t_tmp1 >> 4;
@@ -779,15 +779,15 @@
t = length - 1;
if (t > 0) {
do {
- j = length + (k >> 1);
+ j = length + k / 2;
if (k & 1) {
- r = s >> 3;
+ r = s / 8;
t_tmp1 = t_table[k];
t_tmp2 = t_table[j];
src[r + 2] = (src[r + 2]) | (t_tmp1 & 0xf0);
src[r + 3] = ((t_tmp1 & 0x0f) << 4) | (t_tmp2 >> 4);
} else {
- r = c >> 3;
+ r = c / 8;
t_tmp1 = t_table[k];
t_tmp2 = t_table[j];
src[r + 2] = t_tmp1 >> 4;
@@ -842,8 +842,8 @@
left = 0x2000 - firstWord;
output_size = left;
} else {
- left = 0x1000 - (firstWord >> 1);
- output_size = left << 1;
+ left = 0x1000 - firstWord / 2;
+ output_size = left * 2;
}
} else {
startPos = 1;
@@ -875,14 +875,14 @@
if (channels == 2) {
if (l == 0)
left++;
- left >>= 1;
+ left /= 2;
}
while (left--) {
curTableEntry = _destImcTable[curTablePos];
decompTable = (byte)(curTableEntry - 2);
bitMask = 2 << decompTable;
- readPos = src + (tableEntrySum >> 3);
+ readPos = src + tableEntrySum / 8;
// FIXME - it seems the decoder often reads exactly one byte too
// far - that is, it reads 2 bytes at once, and the second byte
@@ -897,7 +897,7 @@
if (readPos + 1 > comp_input + input_size ||
curTableEntry + (tableEntrySum & 7) > 8) {
error("decompressCodec: input buffer overflow: %d bytes over (we need %d bits of data)",
- (int)((readPos+1) - (comp_input+input_size))+1,
+ (int)((readPos + 1) - (comp_input + input_size)) + 1,
curTableEntry + (tableEntrySum & 7)
);
}
@@ -906,7 +906,7 @@
otherTablePos = (byte)(readWord >> (16 - curTableEntry));
tableEntrySum += curTableEntry;
esiReg = ((imxShortTable[curTableEntry] & otherTablePos)
- << (7 - curTableEntry)) + (curTablePos << 6);
+ << (7 - curTableEntry)) + (curTablePos * 64);
imcTableEntry >>= (curTableEntry - 1);
adder = imcTableEntry + _destImcTable2[esiReg];
if ((otherTablePos & bitMask) != 0) {
@@ -931,7 +931,7 @@
curTablePos = 0;
imcTableEntry = imcTable[curTablePos];
- destPos += channels << 1;
+ destPos += channels * 2;
}
}
}
Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- camera.cpp 15 Oct 2003 09:40:44 -0000 2.17
+++ camera.cpp 16 Nov 2003 20:52:56 -0000 2.18
@@ -99,7 +99,7 @@
setCameraAt(camera._cur.x, 0);
}
- t = (a->_pos.x >> 3);
+ t = a->_pos.x / 8;
if (t - _screenStartStrip < camera._leftTrigger || t - _screenStartStrip > camera._rightTrigger)
setCameraAt(a->_pos.x, 0);
@@ -178,7 +178,7 @@
a = derefActor(camera._follows, "moveCamera");
actorx = a->_pos.x;
- t = (actorx >> 3) - _screenStartStrip;
+ t = actorx / 8 - _screenStartStrip;
if (t < camera._leftTrigger || t > camera._rightTrigger) {
if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) {
@@ -212,7 +212,7 @@
}
/* a is set a bit above */
- if (camera._movingToActor && (camera._cur.x >> 3) == (a->_pos.x >> 3)) {
+ if (camera._movingToActor && (camera._cur.x / 8) == (a->_pos.x / 8)) {
camera._movingToActor = false;
}
@@ -330,13 +330,13 @@
if (_features & GF_NEW_CAMERA) {
_screenLeft = camera._cur.x - (_screenWidth / 2);
} else {
- _screenLeft = _screenStartStrip << 3;
+ _screenLeft = _screenStartStrip * 8;
}
#ifdef V7_SMOOTH_SCROLLING_HACK
virtscr[0].xstart = _screenLeft;
#else
- virtscr[0].xstart = _screenStartStrip << 3;
+ virtscr[0].xstart = _screenStartStrip * 8;
#endif
if (_charset->_hasMask && (_version >= 4 && _gameId != GID_LOOM256)) {
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- costume.cpp 7 Nov 2003 02:11:40 -0000 1.118
+++ costume.cpp 16 Nov 2003 20:52:56 -0000 1.119
@@ -298,7 +298,7 @@
//
uint height = _height;
- num >>= 3;
+ num /= 8;
while (num > 0) {
v1.replen = *_srcptr++;
@@ -335,14 +335,14 @@
};
#define MASK_AT(xoff) \
- (mask && (mask[((v1.x+xoff) >> 3) + v1.imgbufoffs] & revBitMask[(v1.x+xoff) & 7]))
+ (mask && (mask[((v1.x + xoff) / 8) + v1.imgbufoffs] & revBitMask[(v1.x + xoff) & 7]))
#define LINE(c,p) \
pcolor = (color >> c) & 3; \
if (pcolor) { \
if (!MASK_AT(p)) \
dst[p] = palette[pcolor]; \
- if (!MASK_AT(p+1)) \
- dst[p+1] = palette[pcolor]; \
+ if (!MASK_AT(p + 1)) \
+ dst[p + 1] = palette[pcolor]; \
}
void CostumeRenderer::procC64(int actor) {
@@ -360,7 +360,7 @@
color = v1.repcolor;
height = _height;
- v1.skip_width >>= 3;
+ v1.skip_width /= 8;
// Set up the palette data
byte palette[4] = { 0, 0, 0, 0 };
@@ -436,7 +436,7 @@
scaleytab = &v1.scaletable[_scaleIndexY];
maskbit = revBitMask[v1.x & 7];
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
if (len)
goto StartPos;
@@ -486,7 +486,7 @@
}
_scaleIndexX += v1.scaleXstep;
dst = v1.destptr;
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
}
StartPos:;
} while (--len);
@@ -502,7 +502,7 @@
bool masked;
int oldXpos, oldScaleIndexX;
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
dst = v1.destptr;
height = _height;
width = _width;
@@ -532,7 +532,7 @@
maskbit = revBitMask[v1.x & 7];
}
_scaleIndexX += v1.scaleXstep;
- mask = v1.mask_ptr + (v1.x >> 3);
+ mask = v1.mask_ptr + v1.x / 8;
}
if (!--width) {
if (!--height)
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.231
retrieving revision 2.232
diff -u -d -r2.231 -r2.232
--- gfx.cpp 8 Nov 2003 21:59:32 -0000 2.231
+++ gfx.cpp 16 Nov 2003 20:52:56 -0000 2.232
@@ -330,19 +330,19 @@
bottom = vs->height;
if (virt == 0 && dirtybit) {
- lp = (left >> 3) + _screenStartStrip;
+ lp = left / 8 + _screenStartStrip;
if (lp < 0)
lp = 0;
if (_version >= 7) {
#ifdef V7_SMOOTH_SCROLLING_HACK
- rp = (right + vs->xstart) >> 3;
+ rp = (right + vs->xstart) / 8;
#else
- rp = (right >> 3) + _screenStartStrip;
+ rp = right / 8 + _screenStartStrip;
#endif
if (rp > 409)
rp = 409;
} else {
- rp = (right >> 3) + _screenStartStrip;
+ rp = right / 8 + _screenStartStrip;
if (rp >= 200)
rp = 200;
}
@@ -351,8 +351,8 @@
}
// The following code used to be in the separate method setVirtscreenDirty
- lp = left >> 3;
- rp = right >> 3;
+ lp = left / 8;
+ rp = right / 8;
if ((lp >= gdi._numStrips) || (rp < 0))
return;
@@ -416,7 +416,7 @@
return;
if (_vm->_features & GF_NEW_CAMERA && (_vm->camera._cur.y != _vm->camera._last.y)) {
- drawStripToScreen(vs, 0, _numStrips << 3, 0, vs->height);
+ drawStripToScreen(vs, 0, _numStrips * 8, 0, vs->height);
} else {
int i;
int start, w, top, bottom;
@@ -500,7 +500,7 @@
if (bottom > vs->bdirty[strip])
vs->bdirty[strip] = bottom;
- offs = (top * _numStrips + _vm->_screenStartStrip + strip) << 3;
+ offs = (top * _numStrips + _vm->_screenStartStrip + strip) * 8;
byte *mask_ptr = _vm->getMaskBuffer(strip * 8, top, 0);
bgbak_ptr = _vm->getResourceAddress(rtBuffer, 5) + offs;
backbuff_ptr = vs->screenPtr + offs;
@@ -508,7 +508,7 @@
numLinesToProcess = bottom - top;
if (numLinesToProcess) {
if ((_vm->_features & GF_NEW_OPCODES) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_screen)) {
- if (_vm->hasCharsetMask(strip << 3, top, (strip + 1) << 3, bottom))
+ if (_vm->hasCharsetMask(strip * 8, top, (strip + 1) * 8, bottom))
draw8ColWithMasking(backbuff_ptr, bgbak_ptr, numLinesToProcess, mask_ptr);
else
draw8Col(backbuff_ptr, bgbak_ptr, numLinesToProcess);
@@ -761,7 +761,7 @@
}
if (_features & GF_NEW_CAMERA) {
- diff = (camera._cur.x >> 3) - (camera._last.x >> 3);
+ diff = camera._cur.x / 8 - camera._last.x / 8;
if (_fullRedraw == 0 && diff == 1) {
val = 2;
redrawBGStrip(gdi._numStrips - 1, 1);
@@ -864,10 +864,10 @@
if (vs->number == 0 && _charset->_hasMask && height) {
byte *mask;
// Note: At first sight it may look as if this could
- // be optimized to (rect.right - rect.left) >> 3 and
- // thus to width >> 3, but that's not the case since
+ // be optimized to (rect.right - rect.left) / 8 and
+ // thus to width * 8, but that's not the case since
// we are dealing with integer math here.
- int mask_width = (rect.right >> 3) - (rect.left >> 3);
+ int mask_width = (rect.right / 8) - (rect.left / 8);
if (rect.right & 0x07)
mask_width++;
@@ -1008,7 +1008,7 @@
sx = x;
if (vs->scrollable)
- sx -= vs->xstart >> 3;
+ sx -= vs->xstart / 8;
//
// Since V3, all graphics data was encoded in strips, which is very efficient
@@ -1026,8 +1026,8 @@
mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x) + _imgBufOffs[1];
- const int left = (stripnr << 3);
- const int right = left + (numstrip << 3);
+ const int left = (stripnr * 8);
+ const int right = left + (numstrip * 8);
byte *dst = bgbak_ptr;
const byte *src;
byte color, data = 0;
@@ -1166,7 +1166,7 @@
CHECK_HEAP;
if (vs->alloctwobuffers) {
- if (_vm->hasCharsetMask(sx << 3, y, (sx + 1) << 3, bottom)) {
+ if (_vm->hasCharsetMask(sx * 8, y, (sx + 1) * 8, bottom)) {
if (flag & dbClear || !lightsOn)
clear8ColWithMasking(backbuff_ptr, height, mask_ptr);
else
@@ -1360,7 +1360,7 @@
void Gdi::drawStripC64Background(byte *dst, int stripnr, int height) {
int charIdx;
- height >>= 3;
+ height /= 8;
for (int y = 0; y < height; y++) {
_C64Colors[3] = (_C64ColorMap[y + stripnr * height] & 7);
// Check for room color change in V1 zak
@@ -1383,8 +1383,8 @@
void Gdi::drawStripC64Object(byte *dst, int stripnr, int width, int height) {
int charIdx;
- height >>= 3;
- width >>= 3;
+ height /= 8;
+ width /= 8;
for (int y = 0; y < height; y++) {
_C64Colors[3] = (_C64ObjectMap[(y + height) * width + stripnr] & 7);
charIdx = _C64ObjectMap[y * width + stripnr] * 8;
@@ -1401,8 +1401,8 @@
void Gdi::drawStripC64Mask(byte *dst, int stripnr, int width, int height) {
int maskIdx;
- height >>= 3;
- width >>= 3;
+ height /= 8;
+ width /= 8;
for (int y = 0; y < height; y++) {
if (_C64ObjectMode)
maskIdx = _C64ObjectMap[(y + 2 * height) * width + stripnr] * 8;
@@ -1466,7 +1466,7 @@
run = *src++;
}
for (z = 0; z < run; z++) {
- *(dst + y * _vm->_screenWidth + x) = (z&1) ? _roomPalette[color & 0xf] : _roomPalette[color >> 4];
+ *(dst + y * _vm->_screenWidth + x) = (z & 1) ? _roomPalette[color & 0xf] : _roomPalette[color >> 4];
y++;
if (y >= height) {
@@ -1794,7 +1794,7 @@
cl -= 3;
bits >>= 3;
if (incm) {
- color = (byte)((color+incm)&0xFF);
+ color = (byte)((color + incm) & 0xFF);
} else {
FILL_BITS;
reps = bits & 0xFF;
@@ -2297,11 +2297,11 @@
delta[i] = transitionEffects[a].deltaTable[i];
j = transitionEffects[a].stripTable[i];
if (j == 24)
- j = (virtscr[0].height >> 3) - 1;
+ j = virtscr[0].height / 8 - 1;
tab_2[i] = j;
}
- bottom = virtscr[0].height >> 3;
+ bottom = virtscr[0].height / 8;
for (j = 0; j < transitionEffects[a].numOfIterations; j++) {
for (i = 0; i < 4; i++) {
l = tab_2[i * 4];
@@ -2311,8 +2311,8 @@
if (t == b) {
while (l <= r) {
if (l >= 0 && l < gdi._numStrips && (uint) t < (uint) bottom) {
- virtscr[0].tdirty[l] = t << 3;
- virtscr[0].bdirty[l] = (t + 1) << 3;
+ virtscr[0].tdirty[l] = t * 8;
+ virtscr[0].bdirty[l] = (t + 1) * 8;
}
l++;
}
@@ -2323,8 +2323,8 @@
b = bottom;
if (t < 0)
t = 0;
- virtscr[0].tdirty[l] = t << 3;
- virtscr[0].bdirty[l] = (b + 1) << 3;
+ virtscr[0].tdirty[l] = t * 8;
+ virtscr[0].bdirty[l] = (b + 1) * 8;
}
updateDirtyScreen(0);
}
@@ -3330,7 +3330,7 @@
if (offs == NULL)
return NULL;
- size = getResourceDataSize(offs) >> 2;
+ size = getResourceDataSize(offs) / 4;
if ((uint32)idx >= (uint32)size)
return NULL;
@@ -3456,8 +3456,8 @@
const byte *src;
int i;
- w <<= 3;
- h <<= 3;
+ w *= 8;
+ h *= 8;
dst = buf = (byte *) malloc(w * h);
src = vs->screenPtr + vs->xstart;
@@ -3472,7 +3472,7 @@
vs->alloctwobuffers = false;
gdi.disableZBuffer();
- gdi.drawBitmap(im, vs, _screenStartStrip, 0, w, h, 0, w >> 3, 0);
+ gdi.drawBitmap(im, vs, _screenStartStrip, 0, w, h, 0, w / 8, 0);
vs->alloctwobuffers = true;
gdi.enableZBuffer();
@@ -3524,8 +3524,8 @@
void ScummEngine::useBompCursor(const byte *im, int width, int height) {
uint size;
- width <<= 3;
- height <<= 3;
+ width *= 8;
+ height *= 8;
size = width * height;
if (size > sizeof(_grabbedCursor))
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.111
retrieving revision 2.112
diff -u -d -r2.111 -r2.112
--- imuse.cpp 8 Nov 2003 21:59:32 -0000 2.111
+++ imuse.cpp 16 Nov 2003 20:52:56 -0000 2.112
@@ -404,7 +404,7 @@
int IMuseInternal::get_channel_volume(uint a) {
if (a < 8)
return _channel_volume_eff[a];
- return (_master_volume * _music_volume / 255) >> 1;
+ return (_master_volume * _music_volume / 255) / 2;
}
Part *IMuseInternal::allocate_part(byte pri, MidiDriver *midi) {
@@ -697,7 +697,7 @@
}
case 7:
warning ("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
- return _master_volume >> 1; // Convert from 0-255 to 0-127
+ return _master_volume / 2; // Convert from 0-255 to 0-127
case 8:
return startSound(a[1]) ? 0 : -1;
case 9:
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- imuse_player.cpp 8 Nov 2003 21:59:32 -0000 2.38
+++ imuse_player.cpp 16 Nov 2003 20:52:56 -0000 2.39
@@ -879,7 +879,7 @@
return -1;
_volume = vol;
- _vol_eff = _se->get_channel_volume(_vol_chan) *(vol + 1) >> 7;
+ _vol_eff = _se->get_channel_volume(_vol_chan) * (vol + 1) >> 7;
for (part = _parts; part; part = part->_next) {
part->volume(part->_vol);
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- object.cpp 8 Nov 2003 21:59:32 -0000 1.147
+++ object.cpp 16 Nov 2003 20:52:56 -0000 1.148
@@ -408,10 +408,10 @@
checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject");
- xpos = od.x_pos >> 3;
+ xpos = od.x_pos / 8;
ypos = od.y_pos;
- width = od.width >> 3;
+ width = od.width / 8;
height = od.height &= 0xFFFFFFF8; // Mask out last 3 bits
if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip)
@@ -447,13 +447,13 @@
byte flags = Gdi::dbAllowMaskOr;
if (_version == 1) {
gdi._C64ObjectMode = true;
- gdi.decodeC64Gfx(ptr, gdi._C64ObjectMap, width * (height >> 3) * 3);
+ gdi.decodeC64Gfx(ptr, gdi._C64ObjectMap, width * (height / 8) * 3);
}
// Sam & Max needs this to fix object-layering problems with
// the inventory and conversation icons.
if ((_version >= 7 || _gameId == GID_SAMNMAX) && getClass(od.obj_nr, kObjectClassIgnoreBoxes))
flags |= Gdi::dbDrawMaskOnAll;
- gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width << 3, height, x - xpos, numstrip, flags);
+ gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
}
}
@@ -692,14 +692,14 @@
od->obj_nr = READ_LE_UINT16(ptr + 6);
- od->x_pos = *(ptr + 9) << 3;
- od->y_pos = ((*(ptr + 10)) & 0x7F) << 3;
+ od->x_pos = *(ptr + 9) * 8;
+ od->y_pos = ((*(ptr + 10)) & 0x7F) * 8;
od->parentstate = (*(ptr + 10) & 0x80) ? 1 : 0;
if (_version <= 2)
- od->parentstate <<= 3;
+ od->parentstate *= 8;
- od->width = *(ptr + 11) << 3;
+ od->width = *(ptr + 11) * 8;
od->parent = *(ptr + 12);
@@ -773,10 +773,10 @@
} else {
od->obj_nr = READ_LE_UINT16(&(cdhd->v5.obj_id));
- od->width = cdhd->v5.w << 3;
- od->height = cdhd->v5.h << 3;
- od->x_pos = cdhd->v5.x << 3;
- od->y_pos = cdhd->v5.y << 3;
+ od->width = cdhd->v5.w * 8;
+ od->height = cdhd->v5.h * 8;
+ od->x_pos = cdhd->v5.x * 8;
+ od->y_pos = cdhd->v5.y * 8;
if (cdhd->v5.flags == 0x80) {
od->parentstate = 1;
} else {
@@ -857,8 +857,8 @@
for (i = 1; i < _numLocalObjects; i++) {
if (_objs[i].obj_nr == (uint16)obj) {
if (_objs[i].width != 0) {
- for (j = 0; j < _objs[i].width >> 3; j++) {
- strip = (_objs[i].x_pos >> 3) + j;
+ for (j = 0; j < _objs[i].width / 8; j++) {
+ strip = (_objs[i].x_pos / 8) + j;
// Clip value
if (strip < _screenStartStrip)
@@ -1299,8 +1299,8 @@
}
if (x != -1) {
- _objs[i].x_pos = x << 3;
- _objs[i].y_pos = y << 3;
+ _objs[i].x_pos = x * 8;
+ _objs[i].y_pos = y * 8;
}
addObjectToDrawQue(i);
@@ -1334,7 +1334,7 @@
y2 = f;
}
- return getDist(x, y, x2, y2) * 0xFF / ((i + j) >> 1);
+ return getDist(x, y, x2, y2) * 0xFF / ((i + j) / 2);
}
void ScummEngine::setCursorImg(uint img, uint room, uint imgindex) {
@@ -1351,18 +1351,18 @@
if (_version == 8) {
setCursorHotspot(READ_LE_UINT32(&foir.imhd->v8.hotspot[0].x),
READ_LE_UINT32(&foir.imhd->v8.hotspot[0].y));
- w = READ_LE_UINT32(&foir.imhd->v8.width) >> 3;
- h = READ_LE_UINT32(&foir.imhd->v8.height) >> 3;
+ w = READ_LE_UINT32(&foir.imhd->v8.width) / 8;
+ h = READ_LE_UINT32(&foir.imhd->v8.height) / 8;
} else if (_version == 7) {
setCursorHotspot(READ_LE_UINT16(&foir.imhd->v7.hotspot[0].x),
READ_LE_UINT16(&foir.imhd->v7.hotspot[0].y));
- w = READ_LE_UINT16(&foir.imhd->v7.width) >> 3;
- h = READ_LE_UINT16(&foir.imhd->v7.height) >> 3;
+ w = READ_LE_UINT16(&foir.imhd->v7.width) / 8;
+ h = READ_LE_UINT16(&foir.imhd->v7.height) / 8;
} else {
setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x),
READ_LE_UINT16(&foir.imhd->old.hotspot[0].y));
- w = READ_LE_UINT16(&foir.cdhd->v6.w) >> 3;
- h = READ_LE_UINT16(&foir.cdhd->v6.h) >> 3;
+ w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8;
+ h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8;
}
dataptr = getObjectImage(foir.obim, imgindex);
@@ -1555,8 +1555,8 @@
if (right > vs->width)
right = vs->width;
- left_strip = left >> 3;
- right_strip = (right - 1) >> 3;
+ left_strip = left / 8;
+ right_strip = (right - 1) / 8;
if (left_strip < 0)
left_strip = 0;
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.214
retrieving revision 2.215
diff -u -d -r2.214 -r2.215
--- script_v2.cpp 16 Nov 2003 18:34:33 -0000 2.214
+++ script_v2.cpp 16 Nov 2003 20:52:56 -0000 2.215
@@ -743,10 +743,10 @@
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 @@
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 @@
}
while (i < size) {
- work[i-1] = '@';
+ work[i - 1] = '@';
i++;
}
- work[i-1] = 0;
+ work[i - 1] = 0;
memcpy(name, work, i);
runInventoryScript(0);
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- script_v5.cpp 16 Nov 2003 18:34:33 -0000 1.209
+++ script_v5.cpp 16 Nov 2003 20:52:56 -0000 1.210
@@ -837,10 +837,10 @@
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 @@
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 @@
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
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- script_v6.cpp 13 Nov 2003 10:51:02 -0000 1.210
+++ script_v6.cpp 16 Nov 2003 20:52:56 -0000 1.211
@@ -1550,7 +1550,7 @@
case 181: // SO_ROOM_FADE
a = pop();
if (a) {
- _switchRoomEffect = (byte)(a&0xFF);
+ _switchRoomEffect = (byte)(a & 0xFF);
_switchRoomEffect2 = (byte)(a >> 8);
} else {
fadeIn(_newEffect);
@@ -2090,7 +2090,7 @@
if (camera._dest != camera._cur)
break;
} else {
- if (camera._cur.x >> 3 != camera._dest.x >> 3)
+ if (camera._cur.x / 8 != camera._dest.x / 8)
break;
}
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- string.cpp 13 Nov 2003 10:51:02 -0000 1.166
+++ string.cpp 16 Nov 2003 20:52:56 -0000 1.167
@@ -100,7 +100,7 @@
return;
if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && VAR(VAR_TALK_ACTOR) == 0xff)) {
- if ((camera._dest.x >> 3) != (camera._cur.x >> 3) || camera._cur.x != camera._last.x)
+ if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x)
return;
}
@@ -114,20 +114,20 @@
if (VAR(VAR_V5_TALK_STRING_Y) < 0) {
s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF;
- _string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->_pos.y);
+ _string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) / 2) + s - a->elevation + a->_pos.y);
} else {
_string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y);
}
} else {
s = a->scaley * a->talkPosY / 0xFF;
- _string[0].ypos = ((a->talkPosY - s) >> 1) + s - a->elevation + a->_pos.y;
+ _string[0].ypos = ((a->talkPosY - s) / 2) + s - a->elevation + a->_pos.y;
if (_string[0].ypos < _screenTop)
_string[0].ypos = _screenTop;
s = a->scalex * a->talkPosX / 0xFF;
- _string[0].xpos = ((a->talkPosX - s) >> 1) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
+ _string[0].xpos = ((a->talkPosX - s) / 2) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
}
if (_string[0].ypos < 1)
@@ -207,7 +207,7 @@
if (_charset->_center) {
if (t > _charset->_nextLeft)
t = _charset->_nextLeft;
- t <<= 1;
+ t /= 2;
}
buffer = _charsetBuffer + _charsetBufPos;
@@ -215,7 +215,7 @@
_charset->addLinebreaks(0, buffer, 0, t);
if (_charset->_center) {
- _charset->_nextLeft -= _charset->getStringWidth(0, buffer) >> 1;
+ _charset->_nextLeft -= _charset->getStringWidth(0, buffer) / 2;
if (_charset->_nextLeft < 0)
_charset->_nextLeft = 0;
}
@@ -235,7 +235,7 @@
newLine:;
_charset->_nextLeft = _string[0].xpos;
if (_charset->_center) {
- _charset->_nextLeft -= _charset->getStringWidth(0, buffer) >> 1;
+ _charset->_nextLeft -= _charset->getStringWidth(0, buffer) / 2;
}
_charset->_nextTop += _charset->getFontHeight();
if (_version > 3) {
@@ -390,7 +390,7 @@
if (space)
*space = '\0';
if (_charset->_center) {
- _charset->_left -= _charset->getStringWidth(a, buf) >> 1;
+ _charset->_left -= _charset->getStringWidth(a, buf) / 2;
}
if (_version < 7)
@@ -713,7 +713,7 @@
// Center text if necessary
if (_charset->_center) {
- _charset->_nextLeft -= _charset->getStringWidth(0, buf) >> 1;
+ _charset->_nextLeft -= _charset->getStringWidth(0, buf) / 2;
if (_charset->_nextLeft < 0)
_charset->_nextLeft = 0;
}
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- verbs.cpp 3 Oct 2003 18:33:56 -0000 1.81
+++ verbs.cpp 16 Nov 2003 20:52:56 -0000 1.82
@@ -451,29 +451,29 @@
twobufs = vs->alloctwobuffers;
vs->alloctwobuffers = 0;
- xstrip = x >> 3;
+ xstrip = x / 8;
ydiff = y - vs->topline;
obim = getResourceAddress(rtVerb, verb);
assert(obim);
if (_features & GF_OLD_BUNDLE) {
imgw = obim[0];
- imgh = obim[1] >> 3;
+ imgh = obim[1] / 8;
imptr = obim + 2;
} else if (_features & GF_SMALL_HEADER) {
size = READ_LE_UINT32(obim);
imgw = (*(obim + size + 11));
- imgh = (*(obim + size + 17)) >> 3;
+ imgh = (*(obim + size + 17)) / 8;
imptr = getObjectImage(obim, 1);
} else {
imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
if (_version >= 7) {
- imgw = READ_LE_UINT16(&imhd->v7.width) >> 3;
- imgh = READ_LE_UINT16(&imhd->v7.height) >> 3;
+ imgw = READ_LE_UINT16(&imhd->v7.width) / 8;
+ imgh = READ_LE_UINT16(&imhd->v7.height) / 8;
} else {
- imgw = READ_LE_UINT16(&imhd->old.width) >> 3;
- imgh = READ_LE_UINT16(&imhd->old.height) >> 3;
+ imgw = READ_LE_UINT16(&imhd->old.width) / 8;
+ imgh = READ_LE_UINT16(&imhd->old.height) / 8;
}
imptr = getObjectImage(obim, 1);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.68,1.69
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec37.cpp,1.24,1.25 codec47.cpp,1.62,1.63 imuse_channel.cpp,1.22,1.23 smush_font.cpp,1.14,1.15 smush_player.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list