Moved some stuff from CharsetRenderer (back) to ScummEngine, added comments

svn-id: r25250

1 files changed, 2 insertions, 11 deletions

diff --git a/engines/scumm/charset.h b/engines/scumm/charset.h
index 54091eeee7..04aecb98cb 100644
--- a/engines/scumm/charset.h
+++ b/engines/scumm/charset.h
@@ -43,7 +43,6 @@ class CharsetRenderer {
 public:
 
 	Common::Rect _str;
-	int _nextLeft, _nextTop;
 
 	int _top;
 	int _left, _startLeft;
@@ -62,12 +61,6 @@ public:
 	bool _firstChar;
 	bool _disableOffsX;
 
-	/**
-	 * All text is normally rendered into this overlay surface. Then later
-	 * drawStripToScreen() composits it over the game graphics.
-	 */
-	Graphics::Surface _textSurface;
-
 protected:
 	ScummEngine *_vm;
 	byte _curId;
@@ -76,10 +69,6 @@ public:
 	CharsetRenderer(ScummEngine *vm);
 	virtual ~CharsetRenderer();
 
-	void restoreCharsetBg();
-	void clearCharsetMask();
-	void clearTextSurface();
-
 	virtual void printChar(int chr, bool ignoreCharsetMask) = 0;
 	virtual void drawChar(int chr, const Graphics::Surface &s, int x, int y) {}
 
@@ -127,6 +116,8 @@ class CharsetRendererClassic : public CharsetRendererCommon {
 protected:
 	void drawBitsN(const Graphics::Surface &s, byte *dst, const byte *src, byte bpp, int drawTop, int width, int height);
 
+	void printCharIntern(bool is2byte, const byte *charPtr, int origWidth, int origHeight, int width, int height, VirtScreen *vs, bool ignoreCharsetMask);
+
 public:
 	CharsetRendererClassic(ScummEngine *vm) : CharsetRendererCommon(vm) {}