Some refactoring of text drawing routines.

svn-id: r30615

2 files changed, 19 insertions, 14 deletions

diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 10e26f9d20..e2051a85ab 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -795,38 +795,38 @@ void Gfx::restoreGetBackground(const Common::Rect& r, byte *data) {
 }
 
 
-
-uint16 Gfx::getStringWidth(const char *text) {
-	return _font->getStringWidth(text);
-}
-
 void Gfx::getStringExtent(char *text, uint16 maxwidth, int16* width, int16* height) {
 
 	uint16 lines = 0;
 	uint16 w = 0;
 	*width = 0;
 
+	uint16 blankWidth = _font->getStringWidth(" ");
+	uint16 tokenWidth = 0;
+
 	char token[40];
 
 	while (strlen(text) != 0) {
 
 		text = parseNextToken(text, token, 40, "   ", true);
-		w += getStringWidth(token);
+		tokenWidth = _font->getStringWidth(token);
+
+		w += tokenWidth;
 
 		if (!scumm_stricmp(token, "%p")) {
 			lines++;
 		} else {
 			if (w > maxwidth) {
-				w -= getStringWidth(token);
+				w -= tokenWidth;
 				lines++;
 				if (w > *width)
 					*width = w;
 
-				w = getStringWidth(token);
+				w = tokenWidth;
 			}
 		}
 
-		w += getStringWidth(" ");
+		w += blankWidth;
 		text = Common::ltrim(text);
 	}
 
@@ -1170,6 +1170,9 @@ bool Gfx::drawWrappedText(Graphics::Surface* surf, char *text, byte color, int16
 	uint16 rx = 10;
 	uint16 ry = 4;
 
+	uint16 blankWidth = _font->getStringWidth(" ");
+	uint16 tokenWidth = 0;
+
 	char token[40];
 
 	if (wrapwidth == -1)
@@ -1186,17 +1189,20 @@ bool Gfx::drawWrappedText(Graphics::Surface* surf, char *text, byte color, int16
 
 			strcpy(token, "> .......");
 			strncpy(token+2, _password, strlen(_password));
+			tokenWidth = _font->getStringWidth(token);
+
 			rv = true;
 		} else {
+			tokenWidth = _font->getStringWidth(token);
 
-			linewidth += getStringWidth(token);
+			linewidth += tokenWidth;
 
 			if (linewidth > wrapwidth) {
 				// wrap line
 				lines++;
 				rx = 10;			// x
 				ry = 4 + lines*10;	// y
-				linewidth = getStringWidth(token);
+				linewidth = tokenWidth;
 			}
 
 			if (!scumm_stricmp(token, "%s")) {
@@ -1207,8 +1213,8 @@ bool Gfx::drawWrappedText(Graphics::Surface* surf, char *text, byte color, int16
 
 		drawText(surf, rx, ry, token, color);
 
-		rx += getStringWidth(token) + getStringWidth(" ");
-		linewidth += getStringWidth(" ");
+		rx += tokenWidth + blankWidth;
+		linewidth += blankWidth;
 
 		text = Common::ltrim(text);
 	}
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 0913498065..852e7bb792 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -262,7 +262,6 @@ public:
 public:
 
 	// balloons and text
-	uint16 getStringWidth(const char *text);
 	void getStringExtent(char *text, uint16 maxwidth, int16* width, int16* height);
 
 	// labels