[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.4,1.5
Pawe? Ko?odziejski
aquadran at users.sourceforge.net
Sat Aug 31 11:37:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.3,1.4 gfx.cpp,1.6,1.7 saveload.cpp,1.7,1.8 scummvm.cpp,1.8,1.9 string.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv27885
Modified Files:
costume.cpp
Log Message:
fixed with new costume
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- costume.cpp 31 Aug 2002 16:29:17 -0000 1.4
+++ costume.cpp 31 Aug 2002 18:36:34 -0000 1.5
@@ -160,7 +160,7 @@
_right = _left = _xpos;
_scaleIndexX = unk19;
for (i = 0; i < _width; i++) {
- if (_left > (_realWidth - 1)) {
+ if (_left > (_vm->_realWidth - 1)) {
s++;
unk19 = _scaleIndexX;
}
@@ -217,10 +217,10 @@
if (_top >= (int)_outheight || _bottom <= 0)
return 0;
- _ypitch = _height * _realWidth;
+ _ypitch = _height * _vm->_realWidth;
_docontinue = 0;
b = 1;
- if (_left > (_realWidth - 1) || _right <= 0)
+ if (_left > (_vm->_realWidth - 1) || _right <= 0)
return 1;
if (_mirror) {
_ypitch--;
@@ -235,7 +235,7 @@
_docontinue = 1;
}
} else {
- s = _right - _realWidth;
+ s = _right - _vm->_realWidth;
if (s <= 0) {
b = 2;
} else {
@@ -245,12 +245,12 @@
} else {
_ypitch++;
if (scaling == 0)
- s = _right - _realWidth;
+ s = _right - _vm->_realWidth;
if (s > 0) {
if (!newAmiCost) {
_width2 -= s;
ignorePakCols(s);
- _xpos = _realWidth - 1;
+ _xpos = _vm->_realWidth - 1;
_docontinue = 1;
}
} else {
@@ -646,7 +646,7 @@
_scaleIndexX = t + _scaleIndexXStep;
if (cost_scaleTable[t] < _scaleX) {
_xpos += _scaleIndexXStep;
- if (_xpos >= _realWidth)
+ if (_xpos >= _vm->_realWidth)
return;
maskbit = revBitMask[_xpos & 7];
_backbuff_ptr += _scaleIndexXStep;
@@ -694,7 +694,7 @@
pcolor = _shadow_table[*dst];
*dst = pcolor;
}
- dst += _realWidth;
+ dst += _vm->_realWidth;
y++;
}
if (!--height) {
@@ -707,7 +707,7 @@
_scaleIndexX = t + _scaleIndexXStep;
if (cost_scaleTable[t] < _scaleX) {
_xpos += _scaleIndexXStep;
- if (_xpos >= _realWidth)
+ if (_xpos >= _vm->_realWidth)
return;
_backbuff_ptr += _scaleIndexXStep;
}
@@ -745,7 +745,7 @@
len = *src++;
do {
- if (color && x >= 0 && x < _realWidth) {
+ if (color && x >= 0 && x < _vm->_realWidth) {
pcolor = _palette[color];
/* if (pcolor == 13) {
pcolor = _shadow_table[*dst];
@@ -759,7 +759,7 @@
if (!--height)
return;
width = _width;
- dst += _realWidth - step * _width;
+ dst += _vm->_realWidth - step * _width;
x = _xpos;
y++;
if (y >= scrheight)
@@ -795,7 +795,7 @@
len = *src++;
do {
- if (color && x >=0 && x < _realWidth && !(*mask & maskbit)) {
+ if (color && x >=0 && x < _vm->_realWidth && !(*mask & maskbit)) {
pcolor = _palette[color];
/* if (pcolor == 13)
pcolor = _shadow_table[*dst];*/
@@ -824,7 +824,7 @@
width = _width;
x = _xpos;
y++;
- dst += _realWidth - step * _width;
+ dst += _vm->_realWidth - step * _width;
_mask_ptr+=40;
mask = _mask_ptr;
maskbit = revBitMask[_xpos & 7];
@@ -861,7 +861,7 @@
len = *src++;
do {
- if (color && x >= 0 && x < _realWidth && !((*mask | mask[_imgbufoffs]) & maskbit)) {
+ if (color && x >= 0 && x < _vm->_realWidth && !((*mask | mask[_imgbufoffs]) & maskbit)) {
pcolor = _palette[color];
/* if (pcolor == 13)
pcolor = _shadow_table[*dst];*/
@@ -888,7 +888,7 @@
width = _width;
y++;
x = _xpos;
- dst += _realWidth - step * _width;
+ dst += _vm->_realWidth - step * _width;
_mask_ptr+= 40;
mask = _mask_ptr;
maskbit = revBitMask[_xpos & 7];
@@ -949,7 +949,7 @@
return;
if (_xpos != oldXpos) {
- dst += _realWidth - (_xpos - oldXpos);
+ dst += _vm->_realWidth - (_xpos - oldXpos);
_mask_ptr += 40;
mask = _mask_ptr;
y++;
@@ -990,7 +990,7 @@
len = *src++;
do {
if (cost_scaleTable[_scaleIndexY] < _scaleY) {
- if (color && _xpos >= 0 && _xpos < _realWidth && !(*mask & maskbit)) {
+ if (color && _xpos >= 0 && _xpos < _vm->_realWidth && !(*mask & maskbit)) {
pcolor = _palette[color];
/* if (pcolor == 13)
pcolor = _shadow_table[*dst];*/
@@ -1014,7 +1014,7 @@
return;
if (_xpos != oldXpos) {
- dst += _realWidth - (_xpos - oldXpos);
+ dst += _vm->_realWidth - (_xpos - oldXpos);
_mask_ptr += 40;
mask = _mask_ptr;
y++;
@@ -1059,7 +1059,7 @@
do {
if (cost_scaleTable[_scaleIndexY] < _scaleY) {
- if (color && _xpos >= 0 && _xpos < _realWidth) {
+ if (color && _xpos >= 0 && _xpos < _vm->_realWidth) {
pcolor = _palette[color];
/* if (pcolor == 13)
pcolor = _shadow_table[*dst];*/
@@ -1081,7 +1081,7 @@
return;
if (_xpos != oldXpos) {
- dst += _realWidth - (_xpos - oldXpos);
+ dst += _vm->_realWidth - (_xpos - oldXpos);
y++;
}
width = _width;
@@ -1166,7 +1166,7 @@
*dst = pcolor;
}
}
- dst += _realWidth;
+ dst += _vm->_realWidth;
mask += 40;
y++;
}
@@ -1180,7 +1180,7 @@
_scaleIndexX = t + _scaleIndexXStep;
if (cost_scaleTable[t] < _scaleX) {
_xpos += _scaleIndexXStep;
- if (_xpos >= _realWidth)
+ if (_xpos >= _vm->_realWidth)
return;
maskbit = revBitMask[_xpos & 7];
_backbuff_ptr += _scaleIndexXStep;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.3,1.4 gfx.cpp,1.6,1.7 saveload.cpp,1.7,1.8 scummvm.cpp,1.8,1.9 string.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list