aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-06-27 23:54:53 +0000
committerTravis Howell2004-06-27 23:54:53 +0000
commitd4f071c6c69711f0330754ad7f971bb666298941 (patch)
tree1313b404e419c981151f7bf9c3b4577f73d9c2e6 /scumm
parentc7f97c0bcb2da7432ff730cab74a728c84d145f7 (diff)
downloadscummvm-rg350-d4f071c6c69711f0330754ad7f971bb666298941.tar.gz
scummvm-rg350-d4f071c6c69711f0330754ad7f971bb666298941.tar.bz2
scummvm-rg350-d4f071c6c69711f0330754ad7f971bb666298941.zip
That check should of been for HE 7.0 games.
svn-id: r14092
Diffstat (limited to 'scumm')
-rw-r--r--scumm/akos.cpp4
-rw-r--r--scumm/bomp.cpp10
-rw-r--r--scumm/bomp.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index c5aaf2967d..1d94871cc9 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -959,8 +959,8 @@ void AkosRenderer::akos16Decompress(byte *dest, int32 pitch, const byte *src, in
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);
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp
index 36e9cfc2a7..89daf4061d 100644
--- a/scumm/bomp.cpp
+++ b/scumm/bomp.cpp
@@ -29,7 +29,7 @@ namespace Scumm {
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 bompApplyMask(byte *line_buffer, byte *mask, byte maskbit, int32 size, byte
}
}
-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 @@ void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line
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;
diff --git a/scumm/bomp.h b/scumm/bomp.h
index 5a287893a2..d497d6329e 100644
--- a/scumm/bomp.h
+++ b/scumm/bomp.h
@@ -29,7 +29,7 @@ namespace Scumm {
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);