[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.131,1.132 bomp.cpp,2.19,2.20 bomp.h,2.8,2.9

[Travis Howell]

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

Modified Files:
	akos.cpp bomp.cpp bomp.h 
Log Message:

That check should of been for HE 7.0 games.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- akos.cpp	27 Jun 2004 15:41:01 -0000	1.131
+++ akos.cpp	27 Jun 2004 23:54:53 -0000	1.132
@@ -959,8 +959,8 @@
 			bompApplyMask(akos16.buffer, maskptr, maskbit, t_width, transparency);
 			maskptr += maskpitch;
 		}
-		bool humongous = (_vm->_features & GF_HUMONGOUS);
-		bompApplyShadow(_shadow_mode, _shadow_table, akos16.buffer, dest, t_width, transparency, humongous);
+		bool HE7Check = (_vm->_heversion == 70);
+		bompApplyShadow(_shadow_mode, _shadow_table, akos16.buffer, dest, t_width, transparency, HE7Check);
 
 		if (numskip_after != 0)	{
 			akos16SkipData(numskip_after);

Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- bomp.cpp	27 Jun 2004 15:41:01 -0000	2.19
+++ bomp.cpp	27 Jun 2004 23:54:53 -0000	2.20
@@ -29,7 +29,7 @@
 
 static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
 
-static void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte humongous);
+static void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte HE7Check);
 static void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
 static void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
 static void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size);
@@ -111,11 +111,11 @@
 	}
 }
 
-void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte humongous) {
+void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte HE7Check) {
 	assert(size > 0);
 	switch(shadowMode) {
 	case 0:
-		bompApplyShadow0(shadowPalette, line_buffer, dst, size, transparency, humongous);
+		bompApplyShadow0(shadowPalette, line_buffer, dst, size, transparency, HE7Check);
 		break;
 	case 1:
 		bompApplyShadow1(shadowPalette, line_buffer, dst, size, transparency);
@@ -127,11 +127,11 @@
 		error("Unknown shadow mode %d", shadowMode);
 	}
 }
-void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte humongous = false) {
+void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte HE7Check = false) {
 	while (size-- > 0) {
 		byte tmp = *line_buffer++;
 		if (tmp != transparency) {
-			if (humongous)
+			if (HE7Check)
  				*dst = shadowPalette[tmp];
 			else
 				*dst = tmp;

Index: bomp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- bomp.h	27 Jun 2004 15:41:01 -0000	2.8
+++ bomp.h	27 Jun 2004 23:54:53 -0000	2.9
@@ -29,7 +29,7 @@
 int32 setupBompScale(byte *scaling, int32 size, byte scale);
 
 void bompApplyMask(byte *line_buffer, byte *mask, byte maskbit, int32 size, byte transparency);
-void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte humongous = false);
+void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte HE7Check = false);
 
 void decompressBomp(byte *dst, const byte *src, int w, int h);
 void bompDecodeLine(byte *dst, const byte *src, int size);