[Scummvm-cvs-logs] SF.net SVN: scummvm: [32183] scummvm/trunk/engines/kyra/text_mr.cpp

[lordhoto at users.sourceforge.net]

Revision: 32183
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32183&view=rev
Author:   lordhoto
Date:     2008-05-19 13:48:31 -0700 (Mon, 19 May 2008)

Log Message:
-----------
Fix for bug #1967311 "KYRA3: Word-wrapping is slightly buggy".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/text_mr.cpp

Modified: scummvm/trunk/engines/kyra/text_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_mr.cpp	2008-05-19 19:34:55 UTC (rev 32182)
+++ scummvm/trunk/engines/kyra/text_mr.cpp	2008-05-19 20:48:31 UTC (rev 32183)
@@ -55,25 +55,25 @@
 		int count = 0, offs = 0;
 		if (textWidth > (3*maxTextWidth)) {
 			count = getCharLength(p, textWidth/4);
-			offs = dropCRIntoString(p, getCharLength(p, maxTextWidth), count);
+			offs = dropCRIntoString(p, count, getCharLength(p, maxTextWidth));
 			p += count + offs;
-		}
-
+		} 
+		
 		if (textWidth > (2*maxTextWidth)) {
 			count = getCharLength(p, textWidth/3);
-			offs = dropCRIntoString(p, getCharLength(p, maxTextWidth), count);
+			offs = dropCRIntoString(p, count, getCharLength(p, maxTextWidth));
 			p += count + offs;
 			textWidth = _screen->getTextWidth(p);
 		}
 
 		count = getCharLength(p, textWidth/2);
-		offs = dropCRIntoString(p, getCharLength(p, maxTextWidth), count);	
+		offs = dropCRIntoString(p, count, getCharLength(p, maxTextWidth));	
 		p += count + offs;
 		textWidth = _screen->getTextWidth(p);
 
 		if (textWidth > maxTextWidth) {
 			count = getCharLength(p, textWidth/2);
-			offs = dropCRIntoString(p, getCharLength(p, maxTextWidth), count);	
+			offs = dropCRIntoString(p, count, getCharLength(p, maxTextWidth));	
 		}
 	}
 


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