[Scummvm-cvs-logs] SF.net SVN: scummvm: [30406] scummvm/trunk/engines/agos/charset.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jan 11 13:53:32 CET 2008


Revision: 30406
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30406&view=rev
Author:   Kirben
Date:     2008-01-11 04:53:31 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Fix assert that can be triggered in non-English versions of The Feeble Files for Amiga/Macintosh.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/charset.cpp

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2008-01-11 10:59:43 UTC (rev 30405)
+++ scummvm/trunk/engines/agos/charset.cpp	2008-01-11 12:53:31 UTC (rev 30406)
@@ -356,8 +356,14 @@
 				dst -= img_width - 1; // For Hebrew, move from right edge to left edge of image.
 			byte *cur_dst = dst;
 
-			assert(img_width > 0 && img_width < 50 && img_height > 0 && img_height < 50);
+			// Occurs in Amiga and Macintosh ports of The Feeble Files, when
+			// special characters are used by French/German/Spanish versions.
+			// Due to the English image data, been used by all languages.
+			if (img_width == 0 || img_height == 0)
+				continue;
 
+			assert(img_width < 50 && img_height < 50);
+
 			do {
 				for (i = 0; i != img_width; i++) {
 					chr = *img++;


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




More information about the Scummvm-git-logs mailing list