[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.133,2.134 script_v90he.cpp,2.233,2.234 sprite_he.cpp,1.130,1.131 wiz_he.h,2.17,2.18

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14859/scumm

Modified Files:
	script_v100he.cpp script_v90he.cpp sprite_he.cpp wiz_he.h 
Log Message:

Rename wizImage process flag for HE games.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.133
retrieving revision 2.134
diff -u -d -r2.133 -r2.134
--- script_v100he.cpp	20 Apr 2005 05:24:02 -0000	2.133
+++ script_v100he.cpp	20 Apr 2005 06:55:29 -0000	2.134
@@ -1251,7 +1251,7 @@
 		_wizParams.unk_160 = _wizParams.img.y1 = _wizParams.img.x1 = pop();
 		break;
 	case 70:
-		_wizParams.processFlags |= 4;
+		_wizParams.processFlags |= kWPFXmapNum;
 		_wizParams.xmapNum = pop();
 		break;
 	case 73:

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.233
retrieving revision 2.234
diff -u -d -r2.233 -r2.234
--- script_v90he.cpp	20 Apr 2005 05:24:02 -0000	2.233
+++ script_v90he.cpp	20 Apr 2005 06:55:30 -0000	2.234
@@ -624,7 +624,7 @@
 		_wizParams.zoom = pop();
 		break;
 	case 52:
-		_wizParams.processFlags |= 4;
+		_wizParams.processFlags |= kWPFXmapNum;
 		_wizParams.xmapNum = pop();
 		break;
 	case 85: // HE99+

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- sprite_he.cpp	20 Apr 2005 05:24:02 -0000	1.130
+++ sprite_he.cpp	20 Apr 2005 06:55:30 -0000	1.131
@@ -1329,7 +1329,7 @@
 		}
 		if (spi->xmapNum) {
 			wiz.img.flags |= 0x200;
-			wiz.processFlags |= 4;
+			wiz.processFlags |= kWPFXmapNum;
 			wiz.xmapNum = spi->xmapNum;
 		}
 		if (spr_flags & kSFNeedPaletteRemap)

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- wiz_he.h	19 Apr 2005 17:55:09 -0000	2.17
+++ wiz_he.h	20 Apr 2005 06:55:30 -0000	2.18
@@ -91,6 +91,7 @@
 
 enum WizProcessFlags {
 	kWPFSetPos = 0x1,
+	kWPFXmapNum = 0x4,
 	kWPFZoom = 0x8,
 	kWPFRotate = 0x10,
 	kWPFNewFlags = 0x20,