Implemented text drawing and cleanup.

svn-id: r31756

1 files changed, 26 insertions, 7 deletions

diff --git a/engines/made/screen.h b/engines/made/screen.h
index d5dc1bb3e2..0ca28086f9 100644
--- a/engines/made/screen.h
+++ b/engines/made/screen.h
@@ -74,7 +74,17 @@ public:
 	void setGround(uint16 ground) { _ground = ground; }
 	void setTextColor(int16 color) { _textColor = color; }
 
-	void setOutlineColor(int16 color) { 
+	void setTextRect(const Common::Rect &textRect) {
+		_textRect = textRect;
+		_textX = _textRect.left;
+		_textY = _textRect.top;
+	}
+
+	void getTextRect(Common::Rect &textRect) {
+		textRect = _textRect;
+	}
+
+	void setOutlineColor(int16 color) {
 		_outlineColor = color;
 		_dropShadowColor = -1;
 	}
@@ -83,7 +93,12 @@ public:
 		_outlineColor = -1;
 		_dropShadowColor = color;
 	}
-
+	
+	void setTextXY(int16 x, int16 y) {
+		_textX = x;
+		_textY = y;
+	}
+	
 	uint16 updateChannel(uint16 channelIndex);
 	void deleteChannel(uint16 channelIndex);
 	int16 getChannelType(uint16 channelIndex);
@@ -117,9 +132,13 @@ public:
 	void show();
 	void flash(int count);
 	
-	void setFont(int16 fontIndex);
-	void printChar(char c, int16 x, int16 y, byte color);
-	
+	void setFont(int16 fontNum);
+	void printChar(uint c, int16 x, int16 y, byte color);
+	void printText(const char *text);
+	void printTextEx(const char *text, int16 x, int16 y, int16 fontNum, int16 textColor, int16 outlineColor, const ClipInfo &clipInfo);
+	void printObjectText(int16 objectIndex, int16 x, int16 y, int16 fontNum, int16 textColor, int16 outlineColor, const ClipInfo &clipInfo);
+	int16 getTextWidth(int16 fontNum, const char *text);
+
 
 protected:
 	MadeEngine *_vm;
@@ -131,13 +150,13 @@ protected:
 	byte _palette[768], _newPalette[768], _fxPalette[768];
 	int _paletteColorCount, _oldPaletteColorCount;
 	bool _paletteInitialized, _needPalette;
-	uint16 _currentFont;
 	int16 _textColor;
 	int16 _outlineColor;
 	int16 _dropShadowColor;
 
 	int16 _textX, _textY;
-	int16 _currentFontIndex;
+	Common::Rect _textRect;
+	int16 _currentFontNum;
 	FontResource *_font;
 	ClipInfo _fontDrawCtx;