[Scummvm-cvs-logs] SF.net SVN: scummvm:[36077] scummvm/branches/branch-0-13-0/engines/scumm/ proc3ARM.s

[wjpalenstijn at users.sourceforge.net]

Revision: 36077
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36077&view=rev
Author:   wjpalenstijn
Date:     2009-01-26 17:43:47 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
port fix for #2340221 from trunk

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/scumm/proc3ARM.s

Modified: scummvm/branches/branch-0-13-0/engines/scumm/proc3ARM.s
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/proc3ARM.s	2009-01-26 17:37:59 UTC (rev 36076)
+++ scummvm/branches/branch-0-13-0/engines/scumm/proc3ARM.s	2009-01-26 17:43:47 UTC (rev 36077)
@@ -181,6 +181,7 @@
        	BICS	r14,r14,r1,LSL r5	@ r14= len
        	LDREQB	r14,[r11],#1		@ if (!len)  r14 = len = *src++
 	STR	r11,[r13,#src]
+	CMP	r14,#0
 middleloop:
 	@ r0 = _scaleY
 	@ r1 = color
@@ -198,7 +199,7 @@
 	@ r14= len
 
 	MOV	r5,r12		@ loopCount = height
-	CMP	r5,r14		@ if (loopCount > len)
+	CMPNE	r5,r14		@ if (len != 0 && loopCount > len)
 	MOVGT	r5,r14		@	loopCount = len
 	SUB	r12,r12,r5	@ height -= loopCount
 	SUB	r14,r14,r5	@ len    -= loopCount


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