diff options
author | Nicola Mettifogo | 2007-05-06 14:45:20 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-05-06 14:45:20 +0000 |
commit | c892c768a45bd8281688149109cadbc7b80d1b98 (patch) | |
tree | ead7cd9f389204b00c1d1bf5f1589c2aea578838 /engines/parallaction | |
parent | d4d04a150dfefdcce5fe35bbd8af4ef44d57aa3d (diff) | |
download | scummvm-rg350-c892c768a45bd8281688149109cadbc7b80d1b98.tar.gz scummvm-rg350-c892c768a45bd8281688149109cadbc7b80d1b98.tar.bz2 scummvm-rg350-c892c768a45bd8281688149109cadbc7b80d1b98.zip |
Fixed sketch glitches in the introduction.
svn-id: r26765
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/graphics.cpp | 6 | ||||
-rw-r--r-- | engines/parallaction/graphics.h | 4 | ||||
-rw-r--r-- | engines/parallaction/intro.cpp | 134 |
3 files changed, 18 insertions, 126 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index aa90403fcd..f09f337cf4 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -787,7 +787,7 @@ void Gfx::grabRect(byte *dst, const Common::Rect& r, Gfx::Buffers srcbuffer, uin } -void Gfx::maskOpNot(uint16 x, uint16 y, uint16 unused) { +void Gfx::plotMaskPixel(uint16 x, uint16 y, byte color) { uint16 _ax = x + y * SCREEN_WIDTH; _buffers[kMask0][_ax >> 2] &= ~(3 << ((_ax & 3) << 1)); @@ -797,12 +797,12 @@ void Gfx::maskOpNot(uint16 x, uint16 y, uint16 unused) { -void Gfx::maskClearRectangle(const Common::Rect& r) { +void Gfx::fillMaskRect(const Common::Rect& r, byte color) { uint16 _di = r.left/4 + r.top*80; for (uint16 _si = r.top; _si < r.bottom; _si++) { - memset(&_buffers[kMask0][_di], 0, r.width()/4+1); + memset(&_buffers[kMask0][_di], color, r.width()/4+1); _di += 80; } diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index c815f60d27..ff9fed4b32 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -184,8 +184,8 @@ public: void restoreBackground(const Common::Rect& r); // intro - void maskClearRectangle(const Common::Rect& r); - void maskOpNot(uint16 x, uint16 y, uint16 unused); + void fillMaskRect(const Common::Rect& r, byte color); + void plotMaskPixel(uint16 x, uint16 y, byte color); // low level void swapBuffers(); diff --git a/engines/parallaction/intro.cpp b/engines/parallaction/intro.cpp index e782e174c8..f4fc55658d 100644 --- a/engines/parallaction/intro.cpp +++ b/engines/parallaction/intro.cpp @@ -28,6 +28,8 @@ #include "parallaction/graphics.h" #include "parallaction/zone.h" +#include "graphics/primitives.h" + namespace Parallaction { static Animation *_rightHandAnim; @@ -123,7 +125,6 @@ static uint16 _rightHandPositions[684] = { extern Credit _credits[]; - void _c_startIntro(void *parm) { _rightHandAnim = _vm->findAnimation("righthand"); @@ -196,133 +197,24 @@ void _c_moveSheet(void *parm) { return; } - -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); - _vm->_gfx->maskOpNot(newX, newY, unused); - - if (ABS(dx) >= ABS(dy)) { - - int16 v4 = ABS(dy); - if (dx >= 0 && dy >= 0) { - for (uint16 i = 1; i < dx; i++) { - v4 += dy; - if (ABS(dx) < v4) { - oldY++; - v4 -= dx; - } - _vm->_gfx->maskOpNot(i + oldX, oldY, unused); - } - } - - if (dx < 0 && dy >= 0) { - for (uint16 i = 1; i > ABS(dx); i++) { - v4 += dy; - if (ABS(dx) < v4) { - oldY++; - v4 -= ABS(dx); - } - _vm->_gfx->maskOpNot(oldX - i, oldY, unused); - } - } - - if (dx < 0 && dy < 0) { - for (uint16 i = 1; i > ABS(dx); i++) { - v4 += dy; - if (ABS(v4) > ABS(dx)) { - oldY--; - v4 -= ABS(dx); - } - _vm->_gfx->maskOpNot(oldX - i, oldY, unused); - } - } - - if (dx >= 0 && dy < 0) { - for (uint16 i = 1; i < dx; i++) { - v4 -= dy; - if (v4 > dx) { - oldY--; - v4 -= dx; - } - _vm->_gfx->maskOpNot(i + oldX, oldY, unused); - } - } - - } - - if (ABS(dy) < ABS(dx)) { - - int16 v4 = ABS(dx); - - if (dx >= 0 && dy >= 0) { - for (uint16 i = 1; i < dy; i++) { - v4 += dx; - if (v4 > dy) { - oldX++; - v4 -= dy; - } - _vm->_gfx->maskOpNot(oldX, i + oldY, unused); - } - } - - if (dx < 0 && dy >= 0) { - for (uint16 i = 1; i < dy; i++) { - v4 -= dx; - if (v4 > dy) { - oldX--; - v4 -= dy; - } - _vm->_gfx->maskOpNot(oldX, i + oldY, unused); - } - } - - if (dx < 0 && dy < 0) { - for (uint16 i = 1; i < ABS(dy); i++) { - v4 -= ABS(dx); - if (v4 > ABS(dy)) { - oldX--; - v4 -= ABS(dy); - } - _vm->_gfx->maskOpNot(oldX, oldY - i, unused); - } - } - - if (dx >= 0 && dy < 0) { - for (uint16 i = 1; i < ABS(dy); i++) { - v4 += ABS(dx); - if (v4 > ABS(dy)) { - oldX++; - v4 -= ABS(dy); - } - _vm->_gfx->maskOpNot(oldX, oldY - i, unused); - } - } - - } - - - return; +void plotPixel(int x, int y, int color, void *data) { + _vm->_gfx->plotMaskPixel(x, y, color); } - void _c_sketch(void *parm) { static uint16 index = 1; - uint16 _4 = _rightHandPositions[2*index+1]; - uint16 _3 = _rightHandPositions[2*index]; - uint16 _2 = _rightHandPositions[2*(index-1)+1]; - uint16 _1 = _rightHandPositions[2*(index-1)]; + uint16 newy = _rightHandPositions[2*index+1]; + uint16 newx = _rightHandPositions[2*index]; + + uint16 oldy = _rightHandPositions[2*(index-1)+1]; + uint16 oldx = _rightHandPositions[2*(index-1)]; - introFunc1(_1, _2, _3, _4); + Graphics::drawLine(oldx, oldy, newx, newy, 0, plotPixel, NULL); - _rightHandAnim->_left = _rightHandPositions[index*2]; - _rightHandAnim->_top = _rightHandPositions[index*2+1] - 20; + _rightHandAnim->_left = newx; + _rightHandAnim->_top = newy - 20; index++; @@ -341,7 +233,7 @@ void _c_shade(void *parm) { _rightHandAnim->_top ); - _vm->_gfx->maskClearRectangle(r); + _vm->_gfx->fillMaskRect(r, 0); return; |