[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.162,2.163 script_v90he.cpp,2.269,2.270 sprite_he.cpp,1.147,1.148 wiz_he.cpp,2.87,2.88 wiz_he.h,2.25,2.26

kirben kirben at users.sourceforge.net
Sun Jun 5 01:16:17 CEST 2005


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

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

Remove duplicate field.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.162
retrieving revision 2.163
diff -u -d -r2.162 -r2.163
--- script_v100he.cpp	5 Jun 2005 08:02:50 -0000	2.162
+++ script_v100he.cpp	5 Jun 2005 08:15:29 -0000	2.163
@@ -1255,7 +1255,7 @@
 		break;
 	case 70:
 		_wizParams.processFlags |= kWPFShadow;
-		_wizParams.shadow = pop();
+		_wizParams.img.shadow = pop();
 		break;
 	case 73:
 		_wizParams.processFlags |= kWPFNewState;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.269
retrieving revision 2.270
diff -u -d -r2.269 -r2.270
--- script_v90he.cpp	5 Jun 2005 08:02:50 -0000	2.269
+++ script_v90he.cpp	5 Jun 2005 08:15:29 -0000	2.270
@@ -694,7 +694,7 @@
 		break;
 	case 52:
 		_wizParams.processFlags |= kWPFShadow;
-		_wizParams.shadow = pop();
+		_wizParams.img.shadow = pop();
 		break;
 	case 85: // HE99+
 		_wizParams.processFlags |= 0x1000 | 0x100 | 0x2;

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- sprite_he.cpp	5 Jun 2005 08:02:50 -0000	1.147
+++ sprite_he.cpp	5 Jun 2005 08:15:29 -0000	1.148
@@ -1345,7 +1345,7 @@
 		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;

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.87
retrieving revision 2.88
diff -u -d -r2.87 -r2.88
--- wiz_he.cpp	5 Jun 2005 08:02:50 -0000	2.87
+++ wiz_he.cpp	5 Jun 2005 08:15:29 -0000	2.88
@@ -1436,7 +1436,7 @@
 	}
 	int shadow = 0;
 	if (params->processFlags & kWPFShadow) {
-		shadow = params->shadow;
+		shadow = params->img.shadow;
 	}
 	int field_390 = 0;
 	if (params->processFlags & 0x200000) {

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- wiz_he.h	5 Jun 2005 08:02:50 -0000	2.25
+++ wiz_he.h	5 Jun 2005 08:15:30 -0000	2.26
@@ -65,7 +65,6 @@
 	int fileWriteMode;
 	int angle;
 	int scale;
-	int shadow;
 	int field_164;
 	int field_168;
 	int resDefImgW;





More information about the Scummvm-git-logs mailing list