aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2012-06-15 00:38:45 -0400
committerMatthew Hoops2012-06-15 00:41:10 -0400
commita529d960917850d5e7a89293d615e28d9130468a (patch)
treeefd24afdae19b86469d566e22cecb3400d8f1d3c
parent90999d8f8ca9bc0554dcb353a4ee143299bf8bc3 (diff)
downloadscummvm-rg350-a529d960917850d5e7a89293d615e28d9130468a.tar.gz
scummvm-rg350-a529d960917850d5e7a89293d615e28d9130468a.tar.bz2
scummvm-rg350-a529d960917850d5e7a89293d615e28d9130468a.zip
SCUMM: Adjust some wiz image ops and flood fill rects
Fixes black lines appearing on the field in football/football2002 and some soccer2004 menus.
-rw-r--r--engines/scumm/he/script_v100he.cpp6
-rw-r--r--engines/scumm/he/script_v90he.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 3e2053790e..a2eb42214b 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -876,6 +876,7 @@ void ScummEngine_v100he::o100_floodFill() {
_floodFillParams.box.top = 0;
_floodFillParams.box.right = 639;
_floodFillParams.box.bottom = 479;
+ adjustRect(_floodFillParams.box);
break;
case 6:
_floodFillParams.y = pop();
@@ -886,6 +887,7 @@ void ScummEngine_v100he::o100_floodFill() {
_floodFillParams.box.right = pop();
_floodFillParams.box.top = pop();
_floodFillParams.box.left = pop();
+ adjustRect(_floodFillParams.box);
break;
case 20:
_floodFillParams.flags = pop();
@@ -1345,6 +1347,7 @@ void ScummEngine_v100he::o100_wizImageOps() {
_wizParams.fillColor = pop();
_wizParams.box2.top = _wizParams.box2.bottom = pop();
_wizParams.box2.left = _wizParams.box2.right = pop();
+ adjustRect(_wizParams.box2);
break;
case 135:
_wizParams.processFlags |= kWPFDstResNum;
@@ -1358,6 +1361,7 @@ void ScummEngine_v100he::o100_wizImageOps() {
_wizParams.box2.right = pop();
_wizParams.box2.top = pop();
_wizParams.box2.left = pop();
+ adjustRect(_wizParams.box2);
break;
case 137:
_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
@@ -1365,6 +1369,7 @@ void ScummEngine_v100he::o100_wizImageOps() {
_wizParams.fillColor = pop();
_wizParams.box2.top = _wizParams.box2.bottom = pop();
_wizParams.box2.left = _wizParams.box2.right = pop();
+ adjustRect(_wizParams.box2);
break;
case 138:
_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
@@ -1374,6 +1379,7 @@ void ScummEngine_v100he::o100_wizImageOps() {
_wizParams.box2.right = pop();
_wizParams.box2.top = pop();
_wizParams.box2.left = pop();
+ adjustRect(_wizParams.box2);
break;
default:
error("o100_wizImageOps: Unknown case %d", subOp);
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 9e8ac7e2f2..0c3d5b3399 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -244,6 +244,7 @@ void ScummEngine_v90he::o90_wizImageOps() {
_wizParams.box2.right = pop();
_wizParams.box2.top = pop();
_wizParams.box2.left = pop();
+ adjustRect(_wizParams.box2);
break;
case 134: // HE99+
_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
@@ -253,6 +254,7 @@ void ScummEngine_v90he::o90_wizImageOps() {
_wizParams.box2.right = pop();
_wizParams.box2.top = pop();
_wizParams.box2.left = pop();
+ adjustRect(_wizParams.box2);
break;
case 135: // HE99+
_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
@@ -260,6 +262,7 @@ void ScummEngine_v90he::o90_wizImageOps() {
_wizParams.fillColor = pop();
_wizParams.box2.top = _wizParams.box2.bottom = pop();
_wizParams.box2.left = _wizParams.box2.right = pop();
+ adjustRect(_wizParams.box2);
break;
case 136: // HE99+
_wizParams.processFlags |= kWPFFillColor | kWPFClipBox2;
@@ -267,6 +270,7 @@ void ScummEngine_v90he::o90_wizImageOps() {
_wizParams.fillColor = pop();
_wizParams.box2.top = _wizParams.box2.bottom = pop();
_wizParams.box2.left = _wizParams.box2.right = pop();
+ adjustRect(_wizParams.box2);
break;
case 137: // HE99+
_wizParams.processFlags |= kWPFDstResNum;
@@ -1488,6 +1492,7 @@ void ScummEngine_v90he::o90_floodFill() {
_floodFillParams.box.top = 0;
_floodFillParams.box.right = 639;
_floodFillParams.box.bottom = 479;
+ adjustRect(_floodFillParams.box);
break;
case 65:
_floodFillParams.y = pop();
@@ -1501,6 +1506,7 @@ void ScummEngine_v90he::o90_floodFill() {
_floodFillParams.box.right = pop();
_floodFillParams.box.top = pop();
_floodFillParams.box.left = pop();
+ adjustRect(_floodFillParams.box);
break;
case 255:
floodFill(&_floodFillParams, this);