diff options
| author | Robin Watts | 2008-02-03 13:12:51 +0000 |
|---|---|---|
| committer | Robin Watts | 2008-02-03 13:12:51 +0000 |
| commit | f486fd35b3161b48929d8cfb36473b7b553b5591 (patch) | |
| tree | 3226f92df4a5ef0fa37741d705f1d5ec504c79f4 | |
| parent | 77001b85f95482e039e97b9200c6fbe8f1de0b2c (diff) | |
| download | scummvm-rg350-f486fd35b3161b48929d8cfb36473b7b553b5591.tar.gz scummvm-rg350-f486fd35b3161b48929d8cfb36473b7b553b5591.tar.bz2 scummvm-rg350-f486fd35b3161b48929d8cfb36473b7b553b5591.zip | |
Previous commit to enable ARM proc3 stuff for WinCE was broken, as I'd
forgotten to define the enabling symbol in cpp files. Consequently
I'd cocked up when copying the call to the ARM code across from my hacked
costume.cpp into a fresh one.
svn-id: r30766
| -rw-r--r-- | backends/platform/wince/Makefile | 4 | ||||
| -rw-r--r-- | engines/scumm/costume.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile index 134c1cfe14..51ff9d0a81 100644 --- a/backends/platform/wince/Makefile +++ b/backends/platform/wince/Makefile @@ -152,6 +152,10 @@ ifdef USE_ARM_GFX_ASM DEFINES += -DUSE_ARM_GFX_ASM endif +ifdef USE_ARM_COSTUME_ASM +DEFINES += -DUSE_ARM_COSTUME_ASM +endif + ######################################################################## # Targets follow here diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index 3ab1b19bbf..82497de87a 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -444,7 +444,7 @@ void ClassicCostumeRenderer::proc3(Codec1 &v1) { _scaleIndexX = ClassicProc3RendererShadowARM(_scaleY, &v1, &_out, - src, + _srcptr, _height, _scaleX, _scaleIndexX, @@ -452,6 +452,7 @@ void ClassicCostumeRenderer::proc3(Codec1 &v1) { _palette, _numStrips, _scaleIndexY); + return; } #endif /* USE_ARM_COSTUME_ASM */ |