[Scummvm-cvs-logs] SF.net SVN: scummvm:[52800] scummvm/branches/branch-1-2-0/engines/saga/font .cpp

[thebluegr at users.sourceforge.net]

Revision: 52800
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52800&view=rev
Author:   thebluegr
Date:     2010-09-19 08:18:52 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
SAGA: Fixed bug #3068840 - "ITE: ScummVM crashes when talking on the ferry"
(sync with trunk)

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/saga/font.cpp

Modified: scummvm/branches/branch-1-2-0/engines/saga/font.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/saga/font.cpp	2010-09-19 08:18:25 UTC (rev 52799)
+++ scummvm/branches/branch-1-2-0/engines/saga/font.cpp	2010-09-19 08:18:52 UTC (rev 52800)
@@ -123,7 +123,7 @@
 	}
 
 	if (readS.pos() != FONT_DESCSIZE) {
-		error("Invalid font resource size.");
+		error("Invalid font resource size");
 	}
 
 	font->normal.font = (byte*)malloc(fontResourceLength - FONT_DESCSIZE);
@@ -610,7 +610,7 @@
 			}
 			w_total = 0;
 			len_total = 0;
-			if (wc == 0) {
+			if (wc == 0 && measurePointer) {
 				searchPointer = measurePointer + 1;
 			}
 			wc = 0;


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