diff options
| author | Travis Howell | 2005-06-05 08:15:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-06-05 08:15:30 +0000 |
| commit | fe07c5a99f6ac58a09f5762876a557f8f2cf6520 (patch) | |
| tree | 25713e97918d4bb54626650a9bc10977f06de09a /scumm | |
| parent | b452ee87e78269d4560e11845f042663a7c1b669 (diff) | |
| download | scummvm-rg350-fe07c5a99f6ac58a09f5762876a557f8f2cf6520.tar.gz scummvm-rg350-fe07c5a99f6ac58a09f5762876a557f8f2cf6520.tar.bz2 scummvm-rg350-fe07c5a99f6ac58a09f5762876a557f8f2cf6520.zip | |
Remove duplicate field.
svn-id: r18350
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 2 | ||||
| -rw-r--r-- | scumm/sprite_he.cpp | 2 | ||||
| -rw-r--r-- | scumm/wiz_he.cpp | 2 | ||||
| -rw-r--r-- | scumm/wiz_he.h | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 4a40bb1f10..fa07b2964c 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1255,7 +1255,7 @@ void ScummEngine_v100he::o100_wizImageOps() { break; case 70: _wizParams.processFlags |= kWPFShadow; - _wizParams.shadow = pop(); + _wizParams.img.shadow = pop(); break; case 73: _wizParams.processFlags |= kWPFNewState; diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 8c8720f7a7..c8f3f0b436 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -694,7 +694,7 @@ void ScummEngine_v90he::o90_wizImageOps() { break; case 52: _wizParams.processFlags |= kWPFShadow; - _wizParams.shadow = pop(); + _wizParams.img.shadow = pop(); break; case 85: // HE99+ _wizParams.processFlags |= 0x1000 | 0x100 | 0x2; diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index 0af4dd904b..f29ecc2288 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -1345,7 +1345,7 @@ void Sprite::processImages(bool arg) { if (spi->shadow) { wiz.img.flags |= 0x200; wiz.processFlags |= kWPFShadow; - wiz.shadow = spi->shadow; + wiz.img.shadow = spi->shadow; } if (spr_flags & kSFRemapPalette) wiz.img.flags |= kWIFRemapPalette; diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index e33a78938a..4b4e5b402c 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -1436,7 +1436,7 @@ void Wiz::displayWizComplexImage(const WizParameters *params) { } int shadow = 0; if (params->processFlags & kWPFShadow) { - shadow = params->shadow; + shadow = params->img.shadow; } int field_390 = 0; if (params->processFlags & 0x200000) { diff --git a/scumm/wiz_he.h b/scumm/wiz_he.h index 270a73daaf..68767bbc90 100644 --- a/scumm/wiz_he.h +++ b/scumm/wiz_he.h @@ -65,7 +65,6 @@ struct WizParameters { int fileWriteMode; int angle; int scale; - int shadow; int field_164; int field_168; int resDefImgW; |