[Scummvm-cvs-logs] SF.net SVN: scummvm:[48987] scummvm/trunk/engines/scumm
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun May 9 22:17:31 CEST 2010
Revision: 48987
http://scummvm.svn.sourceforge.net/scummvm/?rev=48987&view=rev
Author: lordhoto
Date: 2010-05-09 20:17:30 +0000 (Sun, 09 May 2010)
Log Message:
-----------
Fix for bug #2995282 "FT: Cavefish Hideout Chase (Failure Cutscene) Crash".
The bug itself is actually a regression from r43577, the merge
of the gsoc2009-16bit branch.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/akos.cpp
scummvm/trunk/engines/scumm/bomp.cpp
scummvm/trunk/engines/scumm/bomp.h
Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp 2010-05-09 18:52:40 UTC (rev 48986)
+++ scummvm/trunk/engines/scumm/akos.cpp 2010-05-09 20:17:30 UTC (rev 48987)
@@ -1065,11 +1065,7 @@
bdd.shadowMode = _shadow_mode;
bdd.shadowPalette = _vm->_shadowPalette;
- bdd.actorPalette = 0;
- if (_useBompPalette) {
- for (uint i = 0; i < 256; i++)
- bdd.actorPalette[i] = _palette[i];
- }
+ bdd.actorPalette = _useBompPalette ? _palette : 0;
bdd.mirror = !_mirror;
Modified: scummvm/trunk/engines/scumm/bomp.cpp
===================================================================
--- scummvm/trunk/engines/scumm/bomp.cpp 2010-05-09 18:52:40 UTC (rev 48986)
+++ scummvm/trunk/engines/scumm/bomp.cpp 2010-05-09 20:17:30 UTC (rev 48987)
@@ -38,7 +38,7 @@
static void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, bool 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);
+static void bompApplyActorPalette(uint16 *actorPalette, byte *line_buffer, int32 size);
@@ -172,7 +172,7 @@
}
}
-void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size) {
+void bompApplyActorPalette(uint16 *actorPalette, byte *line_buffer, int32 size) {
actorPalette[255] = 255;
while (size-- > 0) {
*line_buffer = actorPalette[*line_buffer];
Modified: scummvm/trunk/engines/scumm/bomp.h
===================================================================
--- scummvm/trunk/engines/scumm/bomp.h 2010-05-09 18:52:40 UTC (rev 48986)
+++ scummvm/trunk/engines/scumm/bomp.h 2010-05-09 20:17:30 UTC (rev 48987)
@@ -54,7 +54,7 @@
uint16 shadowMode;
byte *shadowPalette;
- byte *actorPalette;
+ uint16 *actorPalette;
bool mirror;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list