[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.97,2.98 script_v90he.cpp,2.192,2.193
kirben
kirben at users.sourceforge.net
Wed Mar 23 19:59:43 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9534/scumm
Modified Files:
script_v100he.cpp script_v90he.cpp
Log Message:
cleanup
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.97
retrieving revision 2.98
diff -u -d -r2.97 -r2.98
--- script_v100he.cpp 23 Mar 2005 00:16:50 -0000 2.97
+++ script_v100he.cpp 24 Mar 2005 03:58:59 -0000 2.98
@@ -1211,7 +1211,7 @@
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 @@
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 @@
_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 @@
_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();
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.192
retrieving revision 2.193
diff -u -d -r2.192 -r2.193
--- script_v90he.cpp 23 Mar 2005 04:38:39 -0000 2.192
+++ script_v90he.cpp 24 Mar 2005 03:59:00 -0000 2.193
@@ -589,7 +589,7 @@
_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 @@
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 @@
_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 @@
_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 @@
_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();
More information about the Scummvm-git-logs
mailing list