aboutsummaryrefslogtreecommitdiff
path: root/scumm/akos.cpp
diff options
context:
space:
mode:
authorMax Horn2004-11-25 23:36:02 +0000
committerMax Horn2004-11-25 23:36:02 +0000
commit85ec4ee0b50cafba5663ca91958582f60438dcc2 (patch)
tree43105ef14c6c48e06b7b65f7c6dc6caf111eeade /scumm/akos.cpp
parent5ad29fd7e08e08b2d82a8ea0b93b093576ad87a0 (diff)
downloadscummvm-rg350-85ec4ee0b50cafba5663ca91958582f60438dcc2.tar.gz
scummvm-rg350-85ec4ee0b50cafba5663ca91958582f60438dcc2.tar.bz2
scummvm-rg350-85ec4ee0b50cafba5663ca91958582f60438dcc2.zip
Turn the v1 member in the costume renderers into a function local object (used to be a member var)
svn-id: r15887
Diffstat (limited to 'scumm/akos.cpp')
-rw-r--r--scumm/akos.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 9756a1622b..bf615c6fe1 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -500,7 +500,7 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
return result;
}
-void AkosRenderer::codec1_genericDecode() {
+void AkosRenderer::codec1_genericDecode(Codec1 &v1) {
const byte *mask, *src;
byte *dst;
byte len, maskbit;
@@ -736,6 +736,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
Common::Rect rect;
int step;
byte drawFlag = 1;
+ Codec1 v1;
const int scaletableSize = (_vm->_features & GF_HUMONGOUS) ? 128 : 384;
@@ -886,7 +887,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
skip = -v1.x;
if (skip > 0) {
v1.skip_width -= skip;
- codec1_ignorePakCols(skip);
+ codec1_ignorePakCols(v1, skip);
v1.x = 0;
} else {
skip = rect.right - _out.w;
@@ -901,7 +902,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
skip = rect.right - _out.w + 1;
if (skip > 0) {
v1.skip_width -= skip;
- codec1_ignorePakCols(skip);
+ codec1_ignorePakCols(v1, skip) ;
v1.x = _out.w - 1;
} else {
skip = -1 - rect.left;
@@ -934,7 +935,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
v1.destptr = (byte *)_out.pixels + v1.y * _out.pitch + v1.x;
- codec1_genericDecode();
+ codec1_genericDecode(v1);
return drawFlag;
}