diff options
| author | Max Horn | 2003-05-29 10:46:07 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-29 10:46:07 +0000 |
| commit | a415492f5dd642c79bfdbfc0a384adf4a4191126 (patch) | |
| tree | b36656f2394b80645341075c9605d7c6ba65793e | |
| parent | 495dbcdff0cb4098ef1bfda94ef79435635295a4 (diff) | |
| download | scummvm-rg350-a415492f5dd642c79bfdbfc0a384adf4a4191126.tar.gz scummvm-rg350-a415492f5dd642c79bfdbfc0a384adf4a4191126.tar.bz2 scummvm-rg350-a415492f5dd642c79bfdbfc0a384adf4a4191126.zip | |
more costume cleanup; fixed small regression I introduced (copy & paste, sigh)
svn-id: r8090
| -rw-r--r-- | scumm/costume.cpp | 9 | ||||
| -rw-r--r-- | scumm/costume.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 817e551952..38a4909e4d 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -184,10 +184,11 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { if (y_top >= (int)_outheight || y_bottom <= 0) return 0; - _docontinue = 0; if (x_left >= _vm->_screenWidth || x_right <= 0) return 1; + v1.replen = 0; + if (_mirror) { if (!use_scaling) skip = -v1.x; @@ -195,7 +196,6 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { _width2 -= skip; codec1_ignorePakCols(skip); v1.x = 0; - _docontinue = 1; } else { skip = x_right - _vm->_screenWidth; if (skip <= 0) { @@ -211,7 +211,6 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { _width2 -= skip; codec1_ignorePakCols(skip); v1.x = _vm->_screenWidth - 1; - _docontinue = 1; } else { skip = -1 - x_left; if (skip <= 0) @@ -284,12 +283,12 @@ void CostumeRenderer::proc3() { y = v1.y; src = _srcptr; dst = v1.destptr; - len = v1.repcolor; + len = v1.replen; color = v1.repcolor; height = _height; width = _width2; - if (_docontinue) + if (v1.replen) goto StartPos; do { diff --git a/scumm/costume.h b/scumm/costume.h index 1c147dd4ed..ef8d6d631d 100644 --- a/scumm/costume.h +++ b/scumm/costume.h @@ -52,7 +52,6 @@ protected: byte _scaleIndexX; /* must wrap at 256 */ byte _scaleIndexY, _scaleIndexYTop; - byte _docontinue; byte _palette[32]; public: |