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

[fingolfin at users.sourceforge.net]

Revision: 22374
Author:   fingolfin
Date:     2006-05-07 04:45:55 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22374&view=rev

Log Message:
-----------
Perform (horizontal) charset text clipping for V1-V3, too

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp
Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2006-05-07 09:34:28 UTC (rev 22373)
+++ scummvm/trunk/engines/scumm/charset.cpp	2006-05-07 11:45:55 UTC (rev 22374)
@@ -1220,11 +1220,14 @@
 		height = _vm->_2byteHeight;
 	} else {
 		charPtr = _fontPtr + chr * 8;
-//		width = height = 8;
 		width = getCharWidth(chr);
 		height = 8;
 	}
 
+	// Clip at the right side (to avoid drawing "outside" the screen bounds).
+	if (_left + origWidth > _right + 1)
+		return;
+
 	origWidth = width;
 	origHeight = height;
 


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