libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 18:41:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

removed explicit references to kMask0 since there is only 1 mask available

Browse Source 
svn-id: r26140
This commit is contained in:
Nicola Mettifogo 2007-03-14 21:57:07 +00:00
parent dcfd64cdbc
commit 62a5f783ee
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/parallaction/animation.cpp
View File

@ -202,7 +202,7 @@ void jobDisplayAnimations(void *parm, Job *j) {
_si = _vm->_gfx->queryMask(v18->_zone.pos._position._y + v18->_cnv._height);
// printf("jobDisplayAnimations %s, x: %i, y: %i, w: %i, h: %i\n", v18->_zone._name, v18->_zone.pos._position._x, v18->_zone.pos._position._y, v14._width, v14._height);
_vm->_gfx->blitCnv(&v14, v18->_zone.pos._position._x, v18->_zone.pos._position._y, _si, Gfx::kBitBack, Gfx::kMask0);
_vm->_gfx->blitCnv(&v14, v18->_zone.pos._position._x, v18->_zone.pos._position._y, _si, Gfx::kBitBack);
}
@ -578,8 +578,8 @@ void jobRunScripts(void *parm, Job *j) {
if (inst->_flags & kInstMaskedPut) {
uint16 _si = _vm->_gfx->queryMask(inst->_opB._value);
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBitBack, Gfx::kMask0 );
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBit2, Gfx::kMask0 );
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBitBack);
_vm->_gfx->blitCnv(&v18, inst->_opA._value, inst->_opB._value, _si, Gfx::kBit2);
} else {
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBitBack, v18._data1);
_vm->_gfx->flatBlitCnv(&v18, inst->_opA._value, inst->_opB._value, Gfx::kBit2, v18._data1);

16
engines/parallaction/graphics.cpp
View File

@ -382,7 +382,7 @@ void Gfx::flatBlit(const Common::Rect& r, byte *data, Gfx::Buffers buffer) {
}
void Gfx::blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer, Gfx::Buffers mask) {
void Gfx::blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer) {
Common::Point dp;
Common::Rect q(r);
@ -395,7 +395,7 @@ void Gfx::blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer,
for (uint16 i = q.top; i < q.bottom; i++) {
uint16 n = dp.x % 4;
byte *m = _buffers[mask] + dp.x/4 + (dp.y + i - q.top)*SCREENMASK_WIDTH;
byte *m = _buffers[kMask0] + dp.x/4 + (dp.y + i - q.top)*SCREENMASK_WIDTH;
for (uint16 j = q.left; j < q.right; j++) {
if (*s != 0) {
@ -527,11 +527,11 @@ void Gfx::flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer, byt
}
void Gfx::blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer, Gfx::Buffers mask) {
void Gfx::blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer) {
Common::Rect r(cnv->_width, cnv->_height);
r.moveTo(x, y);
blit(r, z, cnv->_data0, buffer, mask);
blit(r, z, cnv->_data0, buffer);
return;
}
@ -948,22 +948,22 @@ void Gfx::grabRect(byte *dst, const Common::Rect& r, Gfx::Buffers srcbuffer, uin
}
void Gfx::maskOpNot(uint16 x, uint16 y, uint16 unused, Gfx::Buffers mask) {
void Gfx::maskOpNot(uint16 x, uint16 y, uint16 unused) {
uint16 _ax = x + y * SCREEN_WIDTH;
_buffers[mask][_ax >> 2] &= ~(3 << ((_ax & 3) << 1));
_buffers[kMask0][_ax >> 2] &= ~(3 << ((_ax & 3) << 1));
return;
}
void Gfx::maskClearRectangle(const Common::Rect& r, Gfx::Buffers mask) {
void Gfx::maskClearRectangle(const Common::Rect& r) {
uint16 _di = r.left/4 + r.top*80;
for (uint16 _si = r.top; _si < r.bottom; _si++) {
memset(&_buffers[mask][_di], 0, r.width()/4+1);
memset(&_buffers[kMask0][_di], 0, r.width()/4+1);
_di += 80;
}

8
engines/parallaction/graphics.h
View File

@ -104,8 +104,8 @@ public:
void restoreBackground(const Common::Rect& r);
// intro
void maskClearRectangle(const Common::Rect& r, Gfx::Buffers mask);
void maskOpNot(uint16 x, uint16 y, uint16 unused, Gfx::Buffers mask);
void maskClearRectangle(const Common::Rect& r);
void maskOpNot(uint16 x, uint16 y, uint16 unused);
// low level
void swapBuffers();
@ -116,7 +116,7 @@ public:
void grabRect(byte *dst, const Common::Rect& r, Gfx::Buffers srcbuffer, uint16 pitch);
void floodFill(Gfx::Buffers buffer, const Common::Rect& r, byte color);
void flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer, byte *unused);
void blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer, Gfx::Buffers mask);
void blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer);
// palette
void animatePalette(byte *palette);
@ -158,7 +158,7 @@ protected:
byte mapChar(byte c);
void flatBlit(const Common::Rect& r, byte *data, Gfx::Buffers buffer);
void blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer, Gfx::Buffers mask);
void blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer);
void initBuffers();

26
engines/parallaction/intro.cpp
View File

@ -189,14 +189,14 @@ void _c_moveSheet(void *parm) {
}
void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers mask) {
void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY) {
uint16 unused = 0;
int16 dx = newX - oldX;
int16 dy = newY - oldY;
_vm->_gfx->maskOpNot(oldX, oldY, unused, mask);
_vm->_gfx->maskOpNot(newX, newY, unused, mask);
_vm->_gfx->maskOpNot(oldX, oldY, unused);
_vm->_gfx->maskOpNot(newX, newY, unused);
if (abs(dx) >= abs(dy)) {
@ -208,7 +208,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldY++;
v4 -= dx;
}
_vm->_gfx->maskOpNot(i + oldX, oldY, unused, mask);
_vm->_gfx->maskOpNot(i + oldX, oldY, unused);
}
}
@ -219,7 +219,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldY++;
v4 -= abs(dx);
}
_vm->_gfx->maskOpNot(oldX - i, oldY, unused, mask);
_vm->_gfx->maskOpNot(oldX - i, oldY, unused);
}
}
@ -230,7 +230,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldY--;
v4 -= abs(dx);
}
_vm->_gfx->maskOpNot(oldX - i, oldY, unused, mask);
_vm->_gfx->maskOpNot(oldX - i, oldY, unused);
}
}
@ -241,7 +241,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldY--;
v4 -= dx;
}
_vm->_gfx->maskOpNot(i + oldX, oldY, unused, mask);
_vm->_gfx->maskOpNot(i + oldX, oldY, unused);
}
}
@ -258,7 +258,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldX++;
v4 -= dy;
}
_vm->_gfx->maskOpNot(oldX, i + oldY, unused, mask);
_vm->_gfx->maskOpNot(oldX, i + oldY, unused);
}
}
@ -269,7 +269,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldX--;
v4 -= dy;
}
_vm->_gfx->maskOpNot(oldX, i + oldY, unused, mask);
_vm->_gfx->maskOpNot(oldX, i + oldY, unused);
}
}
@ -280,7 +280,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldX--;
v4 -= abs(dy);
}
_vm->_gfx->maskOpNot(oldX, oldY - i, unused, mask);
_vm->_gfx->maskOpNot(oldX, oldY - i, unused);
}
}
@ -291,7 +291,7 @@ void introFunc1(uint16 oldX, uint16 oldY, uint16 newX, uint16 newY, Gfx::Buffers
oldX++;
v4 -= abs(dy);
}
_vm->_gfx->maskOpNot(oldX, oldY - i, unused, mask);
_vm->_gfx->maskOpNot(oldX, oldY - i, unused);
}
}
@ -311,7 +311,7 @@ void _c_sketch(void *parm) {
uint16 _2 = _rightHandPositions[2*(index-1)+1];
uint16 _1 = _rightHandPositions[2*(index-1)];
introFunc1(_1, _2, _3, _4, Gfx::kMask0 );
introFunc1(_1, _2, _3, _4);
_rightHandAnim->_zone.pos._position._x = _rightHandPositions[index*2];
_rightHandAnim->_zone.pos._position._y = _rightHandPositions[index*2+1] - 20;
@ -333,7 +333,7 @@ void _c_shade(void *parm) {
_rightHandAnim->_zone.pos._position._y
);
_vm->_gfx->maskClearRectangle(r, Gfx::kMask0 );
_vm->_gfx->maskClearRectangle(r);
return;