[Scummvm-cvs-logs] SF.net SVN: scummvm: [30766] scummvm/trunk

[robinwatts at users.sourceforge.net]

Revision: 30766
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30766&view=rev
Author:   robinwatts
Date:     2008-02-03 05:12:51 -0800 (Sun, 03 Feb 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/Makefile
    scummvm/trunk/engines/scumm/costume.cpp

Modified: scummvm/trunk/backends/platform/wince/Makefile
===================================================================
--- scummvm/trunk/backends/platform/wince/Makefile	2008-02-03 13:09:09 UTC (rev 30765)
+++ scummvm/trunk/backends/platform/wince/Makefile	2008-02-03 13:12:51 UTC (rev 30766)
@@ -152,6 +152,10 @@
 DEFINES += -DUSE_ARM_GFX_ASM
 endif
 
+ifdef USE_ARM_COSTUME_ASM
+DEFINES += -DUSE_ARM_COSTUME_ASM
+endif
+
 ########################################################################
 # Targets follow here
 

Modified: scummvm/trunk/engines/scumm/costume.cpp
===================================================================
--- scummvm/trunk/engines/scumm/costume.cpp	2008-02-03 13:09:09 UTC (rev 30765)
+++ scummvm/trunk/engines/scumm/costume.cpp	2008-02-03 13:12:51 UTC (rev 30766)
@@ -444,7 +444,7 @@
 		_scaleIndexX = ClassicProc3RendererShadowARM(_scaleY,
 		                                             &v1,
 		                                             &_out,
-		                                             src,
+		                                             _srcptr,
 		                                             _height,
 		                                             _scaleX,
 		                                             _scaleIndexX,
@@ -452,6 +452,7 @@
 		                                             _palette,
 		                                             _numStrips,
 		                                             _scaleIndexY);
+		return;
 	}
 #endif /* USE_ARM_COSTUME_ASM */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.