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

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sun May 13 04:16:35 CEST 2007


Revision: 26821
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26821&view=rev
Author:   cyx
Date:     2007-05-12 19:16:34 -0700 (Sat, 12 May 2007)

Log Message:
-----------
removed part of my patch for bug #1662610, CharsetRenderer::getStringHeight() is never used

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/charset.h

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2007-05-13 02:11:38 UTC (rev 26820)
+++ scummvm/trunk/engines/scumm/charset.cpp	2007-05-13 02:16:34 UTC (rev 26821)
@@ -348,44 +348,6 @@
 	return width;
 }
 
-int CharsetRenderer::getStringHeight(const byte *text) {
-	int pos = 0;
-	int height = 0;
-	byte chr;
-	int oldID = getCurID();
-
-	while ((chr = text[pos++]) != 0) {
-		if (chr == '\n' || chr == '\r')
-			break;
-		if (chr == '@')
-			continue;
-		if (chr == 255 || (_vm->_game.version <= 6 && chr == 254)) {
-			chr = text[pos++];
-			if (chr == 3) { // 'WAIT'
-				height += getFontHeight();
-				break;
-			}
-			if (chr == 10 || chr == 21 || chr == 12 || chr == 13) {
-				pos += 2;
-				continue;
-			}
-			if (chr == 9 || chr == 1 || chr == 2) { // 'Newline'
-				height += getFontHeight();
-				continue;
-			}
-			if (chr == 14) {
-				int set = text[pos] | (text[pos + 1] << 8);
-				pos += 2;
-				setCurID(set);
-				continue;
-			}
-		}
-	}
-
-	setCurID(oldID);
-	return height + getFontHeight();
-}
-
 void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
 	int lastspace = -1;
 	int curw = 1;

Modified: scummvm/trunk/engines/scumm/charset.h
===================================================================
--- scummvm/trunk/engines/scumm/charset.h	2007-05-13 02:11:38 UTC (rev 26820)
+++ scummvm/trunk/engines/scumm/charset.h	2007-05-13 02:16:34 UTC (rev 26821)
@@ -73,7 +73,6 @@
 	virtual void drawChar(int chr, const Graphics::Surface &s, int x, int y) {}
 
 	int getStringWidth(int a, const byte *str);
-	int getStringHeight(const byte *text);
 	void addLinebreaks(int a, byte *str, int pos, int maxwidth);
 	void translateColor();
 


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