diff options
| author | Neil Millstone | 2010-02-26 16:17:12 +0000 |
|---|---|---|
| committer | Neil Millstone | 2010-02-26 16:17:12 +0000 |
| commit | bcb721cccd46fccba164044cf8afea92872a3c0f (patch) | |
| tree | 9de201160ed19492d7e9e941243019032b9ee294 | |
| parent | e8c2c2b25c12b2e303643bc6ea1f168922d77e40 (diff) | |
| download | scummvm-rg350-bcb721cccd46fccba164044cf8afea92872a3c0f.tar.gz scummvm-rg350-bcb721cccd46fccba164044cf8afea92872a3c0f.tar.bz2 scummvm-rg350-bcb721cccd46fccba164044cf8afea92872a3c0f.zip | |
SCUMM: Fix stride of palette data in ARM optimised costime renderer
svn-id: r48135
| -rw-r--r-- | engines/scumm/costume.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/proc3ARM.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index caa348460f..6fc2b20395 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -420,7 +420,7 @@ extern "C" int ClassicProc3RendererShadowARM(int _scaleY, int _scaleX, int _scaleIndexX, byte *_shadow_table, - byte _palette[32], + uint16 _palette[32], int32 _numStrips, int _scaleIndexY); #endif diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s index 4194432d6e..8b3e31f5f8 100644 --- a/engines/scumm/proc3ARM.s +++ b/engines/scumm/proc3ARM.s @@ -246,7 +246,7 @@ innerloop: 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) |