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

[lordhoto at users.sourceforge.net]

Revision: 41719
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41719&view=rev
Author:   lordhoto
Date:     2009-06-21 01:15:09 +0000 (Sun, 21 Jun 2009)

Log Message:
-----------
Fix drawing of sharp s.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/screen.h

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-06-21 01:14:57 UTC (rev 41718)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-06-21 01:15:09 UTC (rev 41719)
@@ -1008,7 +1008,7 @@
 	fnt->charWidthTableOffset = READ_LE_UINT16(fontData + 8);
 	fnt->charHeightTableOffset = READ_LE_UINT16(fontData + 0xC);
 
-	fnt->glyphCount = *(fnt->fontData + fnt->fontDescOffset + 3);
+	fnt->lastGlyph = *(fnt->fontData + fnt->fontDescOffset + 3);
 
 	return true;
 }
@@ -1134,7 +1134,7 @@
 void Screen::drawCharANSI(uint8 c, int x, int y) {
 	Font *fnt = &_fonts[_currentFont];
 
-	if (c >= fnt->glyphCount)
+	if (c > fnt->lastGlyph)
 		return;
 
 	uint8 *dst = getPagePtr(_curPage) + y * SCREEN_W + x;

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2009-06-21 01:14:57 UTC (rev 41718)
+++ scummvm/trunk/engines/kyra/screen.h	2009-06-21 01:15:09 UTC (rev 41719)
@@ -58,7 +58,7 @@
 	uint16 charWidthTableOffset;
 	uint16 charHeightTableOffset;
 
-	uint8 glyphCount;
+	uint8 lastGlyph;
 };
 
 class Screen {


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