diff options
| author | Travis Howell | 2005-05-29 12:14:31 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-29 12:14:31 +0000 |
| commit | dbba8d7318fea5acf030f3b49b8f2f07c5ab9afe (patch) | |
| tree | aa54a12366751e69cafadd5ca0e2f50a04260f85 | |
| parent | f03b73a6a9d4b91ae9d41dac60c752cbaf51e9c5 (diff) | |
| download | scummvm-rg350-dbba8d7318fea5acf030f3b49b8f2f07c5ab9afe.tar.gz scummvm-rg350-dbba8d7318fea5acf030f3b49b8f2f07c5ab9afe.tar.bz2 scummvm-rg350-dbba8d7318fea5acf030f3b49b8f2f07c5ab9afe.zip | |
Set zorder to zero by default.
svn-id: r18290
| -rw-r--r-- | scumm/script_v90he.cpp | 4 | ||||
| -rw-r--r-- | scumm/sprite_he.cpp | 1 | ||||
| -rw-r--r-- | scumm/wiz_he.cpp | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index e6b288fc67..6956449823 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -647,6 +647,10 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.processFlags = 0; _wizParams.remapNum = 0; _wizParams.img.flags = 0; + _wizParams.field_184 = 0; + _wizParams.field_180 = 0; + _wizParams.spriteId = 0; + _wizParams.groupNum = 0; break; case 16: // HE99+ _wizParams.processFlags |= kWPFMaskImg; diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index 922ef8b5a9..b2d9744cac 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -1334,6 +1334,7 @@ void Sprite::processImages(bool arg) { } wiz.img.flags = kWIFMarkBufferDirty; + wiz.img.zorder = 0; if (spr_flags & kSFXFlipped) wiz.img.flags |= kWIFFlipX; if (spr_flags & kSFYFlipped) diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index eb52b92ba2..0556d54adb 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -1438,10 +1438,6 @@ void Wiz::displayWizComplexImage(const WizParameters *params) { if (params->processFlags & kWPFXmapNum) { xmapNum = params->xmapNum; } - int zorder = 0; - if (params->img.zorder) { - zorder = params->img.zorder; - } int field_390 = 0; if (params->processFlags & 0x200000) { field_390 = params->img.field_390; @@ -1480,7 +1476,7 @@ void Wiz::displayWizComplexImage(const WizParameters *params) { pwi->resNum = params->img.resNum; pwi->x1 = po_x; pwi->y1 = po_y; - pwi->zorder = zorder; + pwi->zorder = params->img.zorder; pwi->state = state; pwi->flags = flags; pwi->xmapNum = xmapNum; @@ -1496,7 +1492,7 @@ void Wiz::displayWizComplexImage(const WizParameters *params) { if (flags & kWIFIsPolygon) { drawWizPolygon(params->img.resNum, state, po_x, flags, xmapNum, dstResNum, paletteNum); // XXX , VAR(VAR_WIZ_TCOLOR)); } else { - drawWizImage(params->img.resNum, state, po_x, po_y, zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum); + drawWizImage(params->img.resNum, state, po_x, po_y, params->img.zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum); } } } |