[Scummvm-cvs-logs] SF.net SVN: scummvm:[48135] scummvm/trunk/engines/scumm
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Fri Feb 26 17:17:15 CET 2010
Revision: 48135
http://scummvm.svn.sourceforge.net/scummvm/?rev=48135&view=rev
Author: agent-q
Date: 2010-02-26 16:17:12 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
SCUMM: Fix stride of palette data in ARM optimised costime renderer
Modified Paths:
--------------
scummvm/trunk/engines/scumm/costume.cpp
scummvm/trunk/engines/scumm/proc3ARM.s
Modified: scummvm/trunk/engines/scumm/costume.cpp
===================================================================
--- scummvm/trunk/engines/scumm/costume.cpp 2010-02-26 08:14:33 UTC (rev 48134)
+++ scummvm/trunk/engines/scumm/costume.cpp 2010-02-26 16:17:12 UTC (rev 48135)
@@ -420,7 +420,7 @@
int _scaleX,
int _scaleIndexX,
byte *_shadow_table,
- byte _palette[32],
+ uint16 _palette[32],
int32 _numStrips,
int _scaleIndexY);
#endif
Modified: scummvm/trunk/engines/scumm/proc3ARM.s
===================================================================
--- scummvm/trunk/engines/scumm/proc3ARM.s 2010-02-26 08:14:33 UTC (rev 48134)
+++ scummvm/trunk/engines/scumm/proc3ARM.s 2010-02-26 16:17:12 UTC (rev 48135)
@@ -246,7 +246,7 @@
BNE masked
@ stall
- LDRB r14,[r14,r1] @ r14 = pcolor = _palette[color]
+ LDRB r14,[r14,r1,lsl#1] @ r14 = pcolor = _palette[color]
@ stall
@ stall
CMP r14,#13 @ if (pcolor == 13)
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