diff options
| author | Travis Howell | 2005-03-24 03:59:00 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-24 03:59:00 +0000 |
| commit | 0030fab85ad3bcdc39d35743dd6b8d293ed6e7d8 (patch) | |
| tree | 174c86e23670a5555ec5ec2b935df29ad838f9bb | |
| parent | 2b45b04e1ac8a5a2a2bfa174c6370477c867d5f0 (diff) | |
| download | scummvm-rg350-0030fab85ad3bcdc39d35743dd6b8d293ed6e7d8.tar.gz scummvm-rg350-0030fab85ad3bcdc39d35743dd6b8d293ed6e7d8.tar.bz2 scummvm-rg350-0030fab85ad3bcdc39d35743dd6b8d293ed6e7d8.zip | |
cleanup
svn-id: r17215
| -rw-r--r-- | scumm/script_v100he.cpp | 10 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 188c7ca7d3..a83e91a8a5 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1211,7 +1211,7 @@ void ScummEngine_v100he::o100_wizImageOps() { case 21: b = pop(); a = pop(); - _wizParams.processFlags |= 0x40; + _wizParams.processFlags |= kWPFRemapPalette; _wizParams.processMode = 6; if (_wizParams.remapNum == 0) { memset(_wizParams.remapIndex, 0, sizeof(_wizParams.remapIndex)); @@ -1340,7 +1340,7 @@ void ScummEngine_v100he::o100_wizImageOps() { pop(); break; case 134: - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 12; _wizParams.fillColor = pop(); _wizParams.box2.top = _wizParams.box2.bottom = pop(); @@ -1351,7 +1351,7 @@ void ScummEngine_v100he::o100_wizImageOps() { _wizParams.unk_380 = pop(); break; case 136: - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 10; _wizParams.fillColor = pop(); _wizParams.box2.bottom = pop(); @@ -1360,14 +1360,14 @@ void ScummEngine_v100he::o100_wizImageOps() { _wizParams.box2.left = pop(); break; case 137: - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 11; _wizParams.fillColor = pop(); _wizParams.box2.top = _wizParams.box2.bottom = pop(); _wizParams.box2.left = _wizParams.box2.right = pop(); break; case 138: - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 9; _wizParams.fillColor = pop(); _wizParams.box2.bottom = pop(); diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 775f58eb58..7003e8a0af 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -589,7 +589,7 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.unk_178 = pop(); break; case 19: - _wizParams.processFlags |= 1; + _wizParams.processFlags |= kWPFSetPos; _wizParams.img.y1 = pop(); _wizParams.img.x1 = pop(); break; @@ -597,7 +597,7 @@ void ScummEngine_v90he::o90_wizImageOps() { case 203: // HE98+ b = pop(); a = pop(); - _wizParams.processFlags |= 0x40; + _wizParams.processFlags |= kWPFRemapPalette; _wizParams.processMode = 6; if (_wizParams.remapNum == 0) { memset(_wizParams.remapIndex, 0, sizeof(_wizParams.remapIndex)); @@ -635,7 +635,7 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.compType = pop(); break; case 87: // HE99+ - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 9; _wizParams.fillColor = pop(); _wizParams.box2.bottom = pop(); @@ -644,7 +644,7 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.box2.left = pop(); break; case 88: // HE99+ - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 10; _wizParams.fillColor = pop(); _wizParams.box2.bottom = pop(); @@ -653,14 +653,14 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.box2.left = pop(); break; case 89: // HE99+ - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 11; _wizParams.fillColor = pop(); _wizParams.box2.top = _wizParams.box2.bottom = pop(); _wizParams.box2.left = _wizParams.box2.right = pop(); break; case 90: // HE99+ - _wizParams.processFlags |= 0x60000; + _wizParams.processFlags |= kWPFFillColor | kWPFClipBox2; _wizParams.processMode = 12; _wizParams.fillColor = pop(); _wizParams.box2.top = _wizParams.box2.bottom = pop(); |