[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.93,1.94 costume.cpp,1.123,1.124 debugger.cpp,1.107,1.108
Max Horn
fingolfin at users.sourceforge.net
Mon Jan 5 08:50:01 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.46,1.47 script_v2.cpp,2.225,2.226 script_v5.cpp,1.219,1.220 script_v6.cpp,1.244,1.245 script_v8.cpp,2.213,2.214
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.98,1.99 graphics.cpp,1.65,1.66 queen.cpp,1.66,1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22336
Modified Files:
akos.cpp costume.cpp debugger.cpp
Log Message:
replace more usages of _screenWidth by more appropriate variables/values
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- akos.cpp 5 Jan 2004 16:19:13 -0000 1.93
+++ akos.cpp 5 Jan 2004 16:49:14 -0000 1.94
@@ -409,7 +409,7 @@
if (v1.scaletable[v1.scaleXindex] < _scaleX) {
v1.x += v1.scaleXstep;
- if (v1.x < 0 || v1.x >= _vm->_screenWidth)
+ if (v1.x < 0 || v1.x >= (int)_outwidth)
return;
maskbit = revBitMask[v1.x & 7];
v1.destptr += v1.scaleXstep;
@@ -1013,7 +1013,7 @@
int32 width_unk, height_unk;
height_unk = clip_top;
- int32 pitch = _vm->_screenWidth;
+ int32 pitch = _outwidth;
int32 dir;
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- costume.cpp 5 Jan 2004 16:19:13 -0000 1.123
+++ costume.cpp 5 Jan 2004 16:49:14 -0000 1.124
@@ -149,7 +149,7 @@
x_right = x_left = v1.x;
_scaleIndexX = startScaleIndexX;
for (i = 0; i < _width; i++) {
- if (x_left > (_vm->_screenWidth - 1)) {
+ if (x_left >= (int)_outwidth) {
skip++;
startScaleIndexX = _scaleIndexX;
}
@@ -209,7 +209,7 @@
if (y_top >= (int)_outheight || y_bottom <= 0)
return 0;
- if (x_left >= _vm->_screenWidth || x_right <= 0)
+ if (x_left >= (int)_outwidth || x_right <= 0)
return 0;
v1.replen = 0;
@@ -224,7 +224,7 @@
v1.x = 0;
}
} else {
- skip = x_right - _vm->_screenWidth;
+ skip = x_right - _outwidth;
if (skip <= 0) {
drawFlag = 2;
} else {
@@ -233,12 +233,12 @@
}
} else {
if (!use_scaling)
- skip = x_right - _vm->_screenWidth;
+ skip = x_right - _outwidth;
if (skip > 0) {
if (!newAmiCost && _loaded._format != 0x57) {
v1.skip_width -= skip;
codec1_ignorePakCols(skip);
- v1.x = _vm->_screenWidth - 1;
+ v1.x = _outwidth - 1;
}
} else {
skip = -1 - x_left;
@@ -410,7 +410,7 @@
height = _height;
y = v1.y;
v1.x += 8 * v1.scaleXstep;
- if (v1.x < 0 || v1.x >= _vm->_screenWidth)
+ if (v1.x < 0 || v1.x >= (int)_outwidth)
return;
mask = v1.mask_ptr;
v1.destptr += 8 * v1.scaleXstep;
@@ -483,7 +483,7 @@
if (_scaleX == 255 || v1.scaletable[_scaleIndexX] < _scaleX) {
v1.x += v1.scaleXstep;
- if (v1.x < 0 || v1.x >= _vm->_screenWidth)
+ if (v1.x < 0 || v1.x >= (int)_outwidth)
return;
maskbit = revBitMask[v1.x & 7];
v1.destptr += v1.scaleXstep;
@@ -526,7 +526,7 @@
if (_scaleY == 255 || cost_scaleTable[_scaleIndexY] < _scaleY) {
masked = (y >= _outheight) || v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit);
- if (color && v1.x >= 0 && v1.x < _vm->_screenWidth && !masked) {
+ if (color && v1.x >= 0 && v1.x < (int)_outwidth && !masked) {
*dst = _palette[color];
}
@@ -546,7 +546,7 @@
return;
if (v1.x != oldXpos) {
- dst += _vm->_screenWidth - (v1.x - oldXpos);
+ dst += _outwidth - (v1.x - oldXpos);
v1.mask_ptr += _numStrips;
mask = v1.mask_ptr;
y++;
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- debugger.cpp 5 Jan 2004 16:19:13 -0000 1.107
+++ debugger.cpp 5 Jan 2004 16:49:14 -0000 1.108
@@ -709,7 +709,7 @@
VirtScreen *vs = _vm->findVirtScreen(coords.ul.y);
if (vs != NULL)
- _vm->markRectAsDirty(vs->number, 0, _vm->_screenWidth, 0, _vm->_screenHeight, 0);
+ _vm->markRectAsDirty(vs->number, 0, vs->width, 0, vs->height, 0);
_vm->drawDirtyScreenParts();
_vm->_system->update_screen();
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.46,1.47 script_v2.cpp,2.225,2.226 script_v5.cpp,1.219,1.220 script_v6.cpp,1.244,1.245 script_v8.cpp,2.213,2.214
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.98,1.99 graphics.cpp,1.65,1.66 queen.cpp,1.66,1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list