[Scummvm-cvs-logs] SF.net SVN: scummvm:[39902] residual/trunk/engine

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Wed Apr 8 11:14:31 CEST 2009


Revision: 39902
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39902&view=rev
Author:   aquadran
Date:     2009-04-08 09:14:31 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
fixed font pt_font drawing

Modified Paths:
--------------
    residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp
    residual/trunk/engine/textobject.cpp

Modified: residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp
===================================================================
--- residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp	2009-04-08 08:16:23 UTC (rev 39901)
+++ residual/trunk/engine/backend/platform/sdl/driver_tinygl.cpp	2009-04-08 09:14:31 UTC (rev 39902)
@@ -745,6 +745,8 @@
 	uint8 g = fgColor.green();
 	uint8 b = fgColor.blue();
 	uint16 color = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+	if (color == 0xf81f)
+		color = 0xf81e;
 
 	for (int i = 0; i < width * height; i++, texDataPtr++, bitmapData++) {
 		byte pixel = *bitmapData;

Modified: residual/trunk/engine/textobject.cpp
===================================================================
--- residual/trunk/engine/textobject.cpp	2009-04-08 08:16:23 UTC (rev 39901)
+++ residual/trunk/engine/textobject.cpp	2009-04-08 09:14:31 UTC (rev 39902)
@@ -215,14 +215,14 @@
 		if (_blastDraw)
 			y = _y + 5;
 		else {
-			if (_font->getHeight() == 21)
+			if (_font->getHeight() == 21) // talk_font,verb_font
 				y = _y - 6;
-			else if (_font->getHeight() == 26)
+			else if (_font->getHeight() == 26) // special_font
 				y = _y - 12;
-			else if (_font->getHeight() == 13)
-				y = _y;
-			else if (_font->getHeight() == 19)
+			else if (_font->getHeight() == 13) // computer_font
 				y = _y - 6;
+			else if (_font->getHeight() == 19) // pt_font
+				y = _y - 9;
 			else
 				y = _y;
 		}


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