WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BFont and BFontBitmap. Also adjust a few "byte *" to "byte *"

21 files changed, 110 insertions, 110 deletions

diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/Ad/AdActor.h
index ab07bf3e77..7ff65a0cae 100644
--- a/engines/wintermute/Ad/AdActor.h
+++ b/engines/wintermute/Ad/AdActor.h
@@ -68,7 +68,7 @@ public:
 	CAdActor(CBGame *inGame/*=NULL*/);

 	virtual ~CAdActor();

 	HRESULT loadFile(const char *filename);

-	HRESULT loadBuffer(byte  *buffer, bool complete = true);

+	HRESULT loadBuffer(byte *buffer, bool complete = true);

 

 	// new anim system

 	Common::String _talkAnimName;

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index c890033e18..2e8e77d36e 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1373,7 +1373,7 @@ HRESULT CAdGame::scheduleChangeScene(const char *filename, bool fadeIn) {
 

 

 //////////////////////////////////////////////////////////////////////////

-HRESULT CAdGame::getVersion(byte  *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) {

+HRESULT CAdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) {

 	CBGame::getVersion(verMajor, verMinor, NULL, NULL);

 

 	if (extMajor) *extMajor = 0;

diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h
index df4d26eaf5..4eef4b8df4 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -144,7 +144,7 @@ public:
 	virtual HRESULT loadBuffer(byte *buffer, bool complete = true);

 

 	HRESULT loadItemsFile(const char *filename, bool merge = false);

-	HRESULT loadItemsBuffer(byte  *buffer, bool merge = false);

+	HRESULT loadItemsBuffer(byte *buffer, bool merge = false);

 

 

 	virtual void PublishNatives();

diff --git a/engines/wintermute/Ad/AdTalkDef.h b/engines/wintermute/Ad/AdTalkDef.h
index 46bcd0da9c..91d1c218e2 100644
--- a/engines/wintermute/Ad/AdTalkDef.h
+++ b/engines/wintermute/Ad/AdTalkDef.h
@@ -46,7 +46,7 @@ public:
 	CAdTalkDef(CBGame *inGame);

 	virtual ~CAdTalkDef();

 	HRESULT loadFile(const char *filename);

-	HRESULT loadBuffer(byte  *buffer, bool complete = true);

+	HRESULT loadBuffer(byte *buffer, bool complete = true);

 	CBArray<CAdTalkNode *, CAdTalkNode *> _nodes;

 	char *_defaultSpriteFilename;

 	CBSprite *_defaultSprite;

diff --git a/engines/wintermute/Base/BFont.cpp b/engines/wintermute/Base/BFont.cpp
index 6158ac6430..490b4be35d 100644
--- a/engines/wintermute/Base/BFont.cpp
+++ b/engines/wintermute/Base/BFont.cpp
@@ -54,18 +54,18 @@ CBFont::~CBFont() {
 

 

 //////////////////////////////////////////////////////////////////////

-void CBFont::drawText(byte  *text, int x, int y, int width, TTextAlign align, int max_height, int MaxLenght) {

+void CBFont::drawText(byte *text, int x, int y, int width, TTextAlign align, int max_height, int maxLength) {

 }

 

 

 //////////////////////////////////////////////////////////////////////

-int CBFont::getTextHeight(byte  *text, int width) {

+int CBFont::getTextHeight(byte *text, int width) {

 	return 0;

 }

 

 

 //////////////////////////////////////////////////////////////////////

-int CBFont::getTextWidth(byte  *text, int MaxLenght) {

+int CBFont::getTextWidth(byte *text, int maxLength) {

 	return 0;

 }

 

@@ -96,7 +96,7 @@ TOKEN_DEF_START
   TOKEN_DEF (FONT)

 TOKEN_DEF_END

 //////////////////////////////////////////////////////////////////////

-HRESULT CBFont::loadBuffer(byte  * Buffer)

+HRESULT CBFont::loadBuffer(byte * Buffer)

 {

     TOKEN_TABLE_START(commands)

         TOKEN_TABLE (FONT)

@@ -154,23 +154,23 @@ HRESULT CBFont::persist(CBPersistMgr *persistMgr) {
 //////////////////////////////////////////////////////////////////////////

 CBFont *CBFont::createFromFile(CBGame *Game, const char *filename) {

 	if (isTrueType(Game, filename)) {

-		CBFontTT *Font = new CBFontTT(Game);

-		if (Font) {

-			if (FAILED(Font->loadFile(filename))) {

-				delete Font;

+		CBFontTT *font = new CBFontTT(Game);

+		if (font) {

+			if (FAILED(font->loadFile(filename))) {

+				delete font;

 				return NULL;

 			}

 		}

-		return Font;

+		return font;

 	} else {

-		CBFontBitmap *Font = new CBFontBitmap(Game);

-		if (Font) {

-			if (FAILED(Font->loadFile(filename))) {

-				delete Font;

+		CBFontBitmap *font = new CBFontBitmap(Game);

+		if (font) {

+			if (FAILED(font->loadFile(filename))) {

+				delete font;

 				return NULL;

 			}

 		}

-		return Font;

+		return font;

 	}

 }

 

@@ -195,12 +195,12 @@ bool CBFont::isTrueType(CBGame *Game, const char *filename) {
 	char *params;

 	CBParser parser(Game);

 

-	bool Ret = false;

+	bool ret = false;

 	if (parser.GetCommand((char **)&WorkBuffer, commands, (char **)&params) == TOKEN_TTFONT)

-		Ret = true;

+		ret = true;

 

 	delete [] buffer;

-	return Ret;

+	return ret;

 }

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/Base/BFont.h b/engines/wintermute/Base/BFont.h
index 93bc426ed9..0c7e1950b1 100644
--- a/engines/wintermute/Base/BFont.h
+++ b/engines/wintermute/Base/BFont.h
@@ -38,9 +38,9 @@ namespace WinterMute {
 class CBFont: public CBObject {

 public:

 	DECLARE_PERSISTENT(CBFont, CBObject)

-	virtual int getTextWidth(byte  *text, int MaxLenght = -1);

-	virtual int getTextHeight(byte  *text, int width);

-	virtual void drawText(byte  *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int MaxLenght = -1);

+	virtual int getTextWidth(byte *text, int maxLength = -1);

+	virtual int getTextHeight(byte *text, int width);

+	virtual void drawText(byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);

 	virtual int getLetterHeight();

 

 	virtual void initLoop() {};

@@ -48,12 +48,12 @@ public:
 	CBFont(CBGame *inGame);

 	virtual ~CBFont();

 

-	static CBFont *createFromFile(CBGame *Game, const char *filename);

+	static CBFont *createFromFile(CBGame *game, const char *filename);

 

 private:

 	//HRESULT loadBuffer(byte * Buffer);

 	//HRESULT loadFile(const char* Filename);

-	static bool isTrueType(CBGame *Game, const char *filename);

+	static bool isTrueType(CBGame *game, const char *filename);

 };

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 714b66f990..4f60dea478 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -70,19 +70,19 @@ CBFontBitmap::~CBFontBitmap() {
 

 

 //////////////////////////////////////////////////////////////////////

-void CBFontBitmap::drawText(byte  *text, int x, int y, int width, TTextAlign align, int max_height, int MaxLenght) {

-	textHeightDraw(text, x, y, width, align, true, max_height, MaxLenght);

+void CBFontBitmap::drawText(byte *text, int x, int y, int width, TTextAlign align, int max_height, int maxLength) {

+	textHeightDraw(text, x, y, width, align, true, max_height, maxLength);

 }

 

 

 //////////////////////////////////////////////////////////////////////

-int CBFontBitmap::getTextHeight(byte  *text, int width) {

+int CBFontBitmap::getTextHeight(byte *text, int width) {

 	return textHeightDraw(text, 0, 0, width, TAL_LEFT, false);

 }

 

 

 //////////////////////////////////////////////////////////////////////

-int CBFontBitmap::getTextWidth(byte  *text, int MaxLength) {

+int CBFontBitmap::getTextWidth(byte *text, int maxLength) {

 	AnsiString str;

 

 	if (Game->_textEncoding == TEXT_UTF8) {

@@ -92,22 +92,22 @@ int CBFontBitmap::getTextWidth(byte  *text, int MaxLength) {
 		str = AnsiString((char *)text);

 	}

 

-	if (MaxLength >= 0 && str.size() > MaxLength)

-		str = Common::String(str.c_str(), MaxLength);

-	//str.substr(0, MaxLength); // TODO: Remove

+	if (maxLength >= 0 && str.size() > maxLength)

+		str = Common::String(str.c_str(), maxLength);

+	//str.substr(0, maxLength); // TODO: Remove

 

-	int TextWidth = 0;

+	int textWidth = 0;

 	for (size_t i = 0; i < str.size(); i++) {

-		TextWidth += getCharWidth(str[i]);

+		textWidth += getCharWidth(str[i]);

 	}

 

-	return TextWidth;

+	return textWidth;

 }

 

 

 //////////////////////////////////////////////////////////////////////

-int CBFontBitmap::textHeightDraw(byte  *text, int x, int y, int width, TTextAlign align, bool draw, int max_height, int MaxLenght) {

-	if (MaxLenght == 0) return 0;

+int CBFontBitmap::textHeightDraw(byte *text, int x, int y, int width, TTextAlign align, bool draw, int maxHeight, int maxLength) {

+	if (maxLength == 0) return 0;

 

 	if (text == NULL || text[0] == '\0') return _tileHeight;

 

@@ -141,14 +141,14 @@ int CBFontBitmap::textHeightDraw(byte  *text, int x, int y, int width, TTextAlig
 	if (draw) Game->_renderer->startSpriteBatch();

 

 	while (!done) {

-		if (max_height > 0 && (NumLines + 1)*_tileHeight > max_height) {

+		if (maxHeight > 0 && (NumLines + 1)*_tileHeight > maxHeight) {

 			if (draw) Game->_renderer->endSpriteBatch();

 			return NumLines * _tileHeight;

 		}

 

 		index++;

 

-		if (str[index] == ' ' && (max_height < 0 || max_height / _tileHeight > 1)) {

+		if (str[index] == ' ' && (maxHeight < 0 || maxHeight / _tileHeight > 1)) {

 			end = index - 1;

 			RealLength = LineLength;

 		}

@@ -166,7 +166,7 @@ int CBFontBitmap::textHeightDraw(byte  *text, int x, int y, int width, TTextAlig
 			long_line = true;

 		}

 

-		if (str.size() == (index + 1) || (MaxLenght >= 0 && index == MaxLenght - 1)) {

+		if (str.size() == (index + 1) || (maxLength >= 0 && index == maxLength - 1)) {

 			done = true;

 			if (!new_line) {

 				end = index;

@@ -215,7 +215,7 @@ int CBFontBitmap::textHeightDraw(byte  *text, int x, int y, int width, TTextAlig
 

 

 //////////////////////////////////////////////////////////////////////

-void CBFontBitmap::drawChar(byte  c, int x, int y) {

+void CBFontBitmap::drawChar(byte c, int x, int y) {

 	if (_fontextFix) c--;

 

 	int row, col;

@@ -225,22 +225,22 @@ void CBFontBitmap::drawChar(byte  c, int x, int y) {
 

 	RECT rect;

 	/* l t r b */

-	int TileWidth;

-	if (_wholeCell) TileWidth = _tileWidth;

-	else TileWidth = _widths[c];

+	int tileWidth;

+	if (_wholeCell) tileWidth = _tileWidth;

+	else tileWidth = _widths[c];

 

-	CBPlatform::SetRect(&rect, col * _tileWidth, row * _tileHeight, col * _tileWidth + TileWidth, (row + 1)*_tileHeight);

-	bool Handled = false;

+	CBPlatform::SetRect(&rect, col * _tileWidth, row * _tileHeight, col * _tileWidth + tileWidth, (row + 1)*_tileHeight);

+	bool handled = false;

 	if (_sprite) {

 		_sprite->GetCurrentFrame();

 		if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < _sprite->_frames.GetSize() && _sprite->_frames[_sprite->_currentFrame]) {

 			if (_sprite->_frames[_sprite->_currentFrame]->_subframes.GetSize() > 0) {

 				_sprite->_frames[_sprite->_currentFrame]->_subframes[0]->_surface->displayTrans(x, y, rect);

 			}

-			Handled = true;

+			handled = true;

 		}

 	}

-	if (!Handled && _subframe) _subframe->_surface->displayTrans(x, y, rect);

+	if (!handled && _subframe) _subframe->_surface->displayTrans(x, y, rect);

 }

 

 

@@ -316,37 +316,37 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 

 	int widths[300];

 	int num = 0, default_width = 8;

-	int last_width = 0;

+	int lastWidth = 0;

 	int i;

 	int r = 255, g = 255, b = 255;

-	bool custo_trans = false;

-	char *surface_file = NULL;

-	char *sprite_file = NULL;

+	bool custoTrans = false;

+	char *surfaceFile = NULL;

+	char *spriteFile = NULL;

 

-	bool AutoWidth = false;

-	int SpaceWidth = 0;

-	int ExpandWidth = 0;

+	bool autoWidth = false;

+	int spaceWidth = 0;

+	int expandWidth = 0;

 

 	while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 

 		switch (cmd) {

 		case TOKEN_IMAGE:

-			surface_file = (char *)params;

+			surfaceFile = (char *)params;

 			break;

 

 		case TOKEN_SPRITE:

-			sprite_file = (char *)params;

+			spriteFile = (char *)params;

 			break;

 

 		case TOKEN_TRANSPARENT:

 			parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);

-			custo_trans = true;

+			custoTrans = true;

 			break;

 

 		case TOKEN_WIDTHS:

 			parser.ScanStr(params, "%D", widths, &num);

-			for (i = 0; last_width < NUM_CHARACTERS, num > 0; last_width++, num--, i++) {

-				_widths[last_width] = (byte)widths[i];

+			for (i = 0; lastWidth < NUM_CHARACTERS, num > 0; lastWidth++, num--, i++) {

+				_widths[lastWidth] = (byte)widths[i];

 			}

 			break;

 

@@ -371,7 +371,7 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 			break;

 

 		case TOKEN_AUTO_WIDTH:

-			parser.ScanStr(params, "%b", &AutoWidth);

+			parser.ScanStr(params, "%b", &autoWidth);

 			break;

 

 		case TOKEN_FONTEXT_FIX:

@@ -383,11 +383,11 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 			break;

 

 		case TOKEN_SPACE_WIDTH:

-			parser.ScanStr(params, "%d", &SpaceWidth);

+			parser.ScanStr(params, "%d", &spaceWidth);

 			break;

 

 		case TOKEN_EXPAND_WIDTH:

-			parser.ScanStr(params, "%d", &ExpandWidth);

+			parser.ScanStr(params, "%d", &expandWidth);

 			break;

 

 		case TOKEN_EDITOR_PROPERTY:

@@ -401,19 +401,19 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 		return E_FAIL;

 	}

 

-	if (sprite_file != NULL) {

+	if (spriteFile != NULL) {

 		delete _sprite;

 		_sprite = new CBSprite(Game, this);

-		if (!_sprite || FAILED(_sprite->loadFile(sprite_file))) {

+		if (!_sprite || FAILED(_sprite->loadFile(spriteFile))) {

 			delete _sprite;

 			_sprite = NULL;

 		}

 	}

 

-	if (surface_file != NULL && !_sprite) {

+	if (surfaceFile != NULL && !_sprite) {

 		_subframe = new CBSubFrame(Game);

-		if (custo_trans) _subframe->setSurface(surface_file, false, r, g, b);

-		else _subframe->setSurface(surface_file);

+		if (custoTrans) _subframe->setSurface(surfaceFile, false, r, g, b);

+		else _subframe->setSurface(surfaceFile);

 	}

 

 

@@ -422,14 +422,14 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 		return E_FAIL;

 	}

 

-	if (AutoWidth) {

+	if (autoWidth) {

 		// calculate characters width

 		getWidths();

 

 		// do we need to modify widths?

-		if (ExpandWidth != 0) {

+		if (expandWidth != 0) {

 			for (i = 0; i < NUM_CHARACTERS; i++) {

-				int NewWidth = (int)_widths[i] + ExpandWidth;

+				int NewWidth = (int)_widths[i] + expandWidth;

 				if (NewWidth < 0) NewWidth = 0;

 

 				_widths[i] = (byte)NewWidth;

@@ -437,17 +437,17 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
 		}

 

 		// handle space character

-		char SpaceChar = ' ';

-		if (_fontextFix) SpaceChar--;

+		uint32 spaceChar = ' ';

+		if (_fontextFix) spaceChar--;

 

-		if (SpaceWidth != 0) _widths[SpaceChar] = SpaceWidth;

+		if (spaceWidth != 0) _widths[spaceChar] = spaceWidth;

 		else {

-			if (_widths[SpaceChar] == ExpandWidth || _widths[SpaceChar] == 0) {

-				_widths[SpaceChar] = (_widths['m'] + _widths['i']) / 2;

+			if (_widths[spaceChar] == expandWidth || _widths[spaceChar] == 0) {

+				_widths[spaceChar] = (_widths['m'] + _widths['i']) / 2;

 			}

 		}

 	} else {

-		for (i = last_width; i < NUM_CHARACTERS; i++) _widths[i] = default_width;

+		for (i = lastWidth; i < NUM_CHARACTERS; i++) _widths[i] = default_width;

 	}

 

 

@@ -482,9 +482,9 @@ HRESULT CBFontBitmap::persist(CBPersistMgr *persistMgr) {
 

 

 //////////////////////////////////////////////////////////////////////////

-int CBFontBitmap::getCharWidth(byte  Index) {

-	if (_fontextFix) Index--;

-	return _widths[Index];

+int CBFontBitmap::getCharWidth(byte index) {

+	if (_fontextFix) index--;

+	return _widths[index];

 }

 

 

@@ -508,20 +508,20 @@ HRESULT CBFontBitmap::getWidths() {
 		int yyy = (i / _numColumns) * _tileHeight;

 

 

-		int min_col = -1;

+		int minCol = -1;

 		for (int row = 0; row < _tileHeight; row++) {

-			for (int col = _tileWidth - 1; col >= min_col + 1; col--) {

+			for (int col = _tileWidth - 1; col >= minCol + 1; col--) {

 				if (xxx + col < 0 || xxx + col >= surf->getWidth() || yyy + row < 0 || yyy + row >= surf->getHeight()) continue;

 				if (!surf->isTransparentAtLite(xxx + col, yyy + row)) {

 					//min_col = col;

-					min_col = MAX(col, min_col);

+					minCol = MAX(col, minCol);

 					break;

 				}

 			}

-			if (min_col == _tileWidth - 1) break;

+			if (minCol == _tileWidth - 1) break;

 		}

 

-		_widths[i] = min_col + 1;

+		_widths[i] = minCol + 1;

 	}

 	surf->endPixelOp();

 	/*

diff --git a/engines/wintermute/Base/BFontBitmap.h b/engines/wintermute/Base/BFontBitmap.h
index c1ccddd3bf..aba1690db5 100644
--- a/engines/wintermute/Base/BFontBitmap.h
+++ b/engines/wintermute/Base/BFontBitmap.h
@@ -37,11 +37,11 @@ class CBSubFrame;
 class CBFontBitmap : public CBFont {

 public:

 	DECLARE_PERSISTENT(CBFontBitmap, CBFont)

-	HRESULT loadBuffer(byte  *Buffer);

+	HRESULT loadBuffer(byte *Buffer);

 	HRESULT loadFile(const char *filename);

-	virtual int getTextWidth(byte  *text, int MaxLength = -1);

-	virtual int getTextHeight(byte  *text, int width);

-	virtual void drawText(byte  *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int MaxLenght = -1);

+	virtual int getTextWidth(byte *text, int maxLength = -1);

+	virtual int getTextHeight(byte *text, int width);

+	virtual void drawText(byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);

 	virtual int getLetterHeight();

 

 	CBFontBitmap(CBGame *inGame);

@@ -60,10 +60,10 @@ public:
 	bool _wholeCell;

 

 private:

-	int getCharWidth(byte  Index);

+	int getCharWidth(byte index);

 	void drawChar(byte  c, int x, int y);

 

-	int textHeightDraw(byte  *text, int x, int y, int width, TTextAlign align, bool draw, int max_height = -1, int MaxLenght = -1);

+	int textHeightDraw(byte *text, int x, int y, int width, TTextAlign align, bool draw, int max_height = -1, int MaxLength = -1);

 

 };

 

diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index ed8a1c7771..4f6aff43b6 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -121,7 +121,7 @@ void CBFontTT::initLoop() {
 }

 

 //////////////////////////////////////////////////////////////////////////

-int CBFontTT::getTextWidth(byte  *Text, int MaxLength) {

+int CBFontTT::getTextWidth(byte *Text, int MaxLength) {

 	WideString text;

 

 	if (Game->_textEncoding == TEXT_UTF8) text = StringUtil::utf8ToWide((char *)Text);

@@ -138,7 +138,7 @@ int CBFontTT::getTextWidth(byte  *Text, int MaxLength) {
 }

 

 //////////////////////////////////////////////////////////////////////////

-int CBFontTT::getTextHeight(byte  *Text, int Width) {

+int CBFontTT::getTextHeight(byte *Text, int Width) {

 	WideString text;

 

 	if (Game->_textEncoding == TEXT_UTF8) text = StringUtil::utf8ToWide((char *)Text);

@@ -153,7 +153,7 @@ int CBFontTT::getTextHeight(byte  *Text, int Width) {
 

 

 //////////////////////////////////////////////////////////////////////////

-void CBFontTT::drawText(byte  *Text, int X, int Y, int Width, TTextAlign Align, int MaxHeight, int MaxLength) {

+void CBFontTT::drawText(byte *Text, int X, int Y, int Width, TTextAlign Align, int MaxHeight, int MaxLength) {

 	if (Text == NULL || strcmp((char *)Text, "") == 0) return;

 

 	WideString text = (char *)Text;

diff --git a/engines/wintermute/Base/BFontTT.h b/engines/wintermute/Base/BFontTT.h
index 9ae713f6f4..7fefaad9df 100644
--- a/engines/wintermute/Base/BFontTT.h
+++ b/engines/wintermute/Base/BFontTT.h
@@ -118,9 +118,9 @@ public:
 	CBFontTT(CBGame *inGame);

 	virtual ~CBFontTT(void);

 

-	virtual int getTextWidth(byte  *text, int maxLenght = -1);

-	virtual int getTextHeight(byte  *text, int width);

-	virtual void drawText(byte  *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLenght = -1);

+	virtual int getTextWidth(byte *text, int maxLength = -1);

+	virtual int getTextHeight(byte *text, int width);

+	virtual void drawText(byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);

 	virtual int getLetterHeight();

 

 	HRESULT loadBuffer(byte *buffer);

diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index 7818d40396..f179914bc1 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -132,7 +132,7 @@ TOKEN_DEF(EDITOR_PROPERTY)
 TOKEN_DEF(KILL_SOUND)

 TOKEN_DEF_END

 //////////////////////////////////////////////////////////////////////

-HRESULT CBFrame::loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded) {

+HRESULT CBFrame::loadBuffer(byte *Buffer, int LifeTime, bool KeepLoaded) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(DELAY)

 	TOKEN_TABLE(IMAGE)

diff --git a/engines/wintermute/Base/BFrame.h b/engines/wintermute/Base/BFrame.h
index 8c75fc50c6..4bfbe0bd17 100644
--- a/engines/wintermute/Base/BFrame.h
+++ b/engines/wintermute/Base/BFrame.h
@@ -53,7 +53,7 @@ public:
 	uint32 _delay;

 	CBArray<CBSubFrame *, CBSubFrame *> _subframes;

 	HRESULT draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, bool Precise = true, uint32 Alpha = 0xFFFFFFFF, bool AllFrames = false, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL);

-	HRESULT loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded);

+	HRESULT loadBuffer(byte *Buffer, int LifeTime, bool KeepLoaded);

 

 	CBFrame(CBGame *inGame);

 	virtual ~CBFrame();

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 6e36df929f..9f8a67490e 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -757,7 +757,7 @@ TOKEN_DEF(GUID)
 TOKEN_DEF(COMPAT_KILL_METHOD_THREADS)

 TOKEN_DEF_END

 //////////////////////////////////////////////////////////////////////////

-HRESULT CBGame::loadBuffer(byte  *buffer, bool complete) {

+HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(GAME)

 	TOKEN_TABLE(TEMPLATE)

diff --git a/engines/wintermute/Base/BPersistMgr.h b/engines/wintermute/Base/BPersistMgr.h
index 90dcb12c75..f2f428fb25 100644
--- a/engines/wintermute/Base/BPersistMgr.h
+++ b/engines/wintermute/Base/BPersistMgr.h
@@ -68,8 +68,8 @@ public:
 	bool getSaveExists(int slot);

 	HRESULT initLoad(const char *filename);

 	HRESULT initSave(const char *desc);

-	HRESULT getBytes(byte  *buffer, uint32 size);

-	HRESULT putBytes(byte  *buffer, uint32 size);

+	HRESULT getBytes(byte *buffer, uint32 size);

+	HRESULT putBytes(byte *buffer, uint32 size);

 	uint32 _offset;

 

 	bool _saving;

diff --git a/engines/wintermute/Base/BScriptHolder.h b/engines/wintermute/Base/BScriptHolder.h
index 688e13c7e3..f417cc7e51 100644
--- a/engines/wintermute/Base/BScriptHolder.h
+++ b/engines/wintermute/Base/BScriptHolder.h
@@ -52,7 +52,7 @@ public:
 	virtual HRESULT listen(CBScriptHolder *param1, uint32 param2);

 	HRESULT applyEvent(const char *eventName, bool unbreakable = false);

 	void setFilename(const char *filename);

-	HRESULT parseProperty(byte  *buffer, bool complete = true);

+	HRESULT parseProperty(byte *buffer, bool complete = true);

 	char *_filename;

 	bool _freezable;

 	bool _ready;

diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/Base/BSprite.h
index da69fb6566..5a9cbc1515 100644
--- a/engines/wintermute/Base/BSprite.h
+++ b/engines/wintermute/Base/BSprite.h
@@ -66,7 +66,7 @@ public:
 	bool _changed;

 	bool _paused;

 	bool _finished;

-	HRESULT loadBuffer(byte  *Buffer, bool Compete = true, int LifeTime = -1, TSpriteCacheType CacheType = CACHE_ALL);

+	HRESULT loadBuffer(byte *Buffer, bool Compete = true, int LifeTime = -1, TSpriteCacheType CacheType = CACHE_ALL);

 	HRESULT loadFile(const char *filename, int LifeTime = -1, TSpriteCacheType CacheType = CACHE_ALL);

 	uint32 _lastFrameTime;

 	HRESULT Draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, uint32 Alpha = 0xFFFFFFFF);

diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index a561d55345..02395da74a 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -90,7 +90,7 @@ TOKEN_DEF(EDITOR_SELECTED)
 TOKEN_DEF(EDITOR_PROPERTY)

 TOKEN_DEF_END

 //////////////////////////////////////////////////////////////////////

-HRESULT CBSubFrame::loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded) {

+HRESULT CBSubFrame::loadBuffer(byte *Buffer, int LifeTime, bool KeepLoaded) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(IMAGE)

 	TOKEN_TABLE(TRANSPARENT)

diff --git a/engines/wintermute/Base/BSubFrame.h b/engines/wintermute/Base/BSubFrame.h
index a54dedefb0..3b90cb3c8a 100644
--- a/engines/wintermute/Base/BSubFrame.h
+++ b/engines/wintermute/Base/BSubFrame.h
@@ -51,7 +51,7 @@ public:
 	bool _editorSelected;

 	CBSubFrame(CBGame *inGame);

 	virtual ~CBSubFrame();

-	HRESULT loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded);

+	HRESULT loadBuffer(byte *Buffer, int LifeTime, bool KeepLoaded);

 	HRESULT draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, bool Precise = true, uint32 Alpha = 0xFFFFFFFF, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL);

 	bool getBoundingRect(LPRECT Rect, int X, int Y, float ScaleX = 100, float ScaleY = 100);

 

diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h
index 3b527e4032..91644052bb 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.h
+++ b/engines/wintermute/Base/scriptables/ScEngine.h
@@ -38,7 +38,7 @@
 

 namespace WinterMute {

 

-typedef byte *(*DLL_COMPILE_BUFFER)(byte  *Buffer, char *Source, uint32 BufferSize, uint32 *CompiledSize);

+typedef byte *(*DLL_COMPILE_BUFFER)(byte *Buffer, char *Source, uint32 BufferSize, uint32 *CompiledSize);

 typedef byte *(*DLL_COMPILE_FILE)(char *Filename, uint32 *CompiledSize);

 typedef void (*DLL_RELEASE_BUFFER)(unsigned char *Buffer);

 typedef void (*DLL_SET_CALLBACKS)(CALLBACKS *callbacks, void *Data);

diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h
index f096af390c..eba931b57f 100644
--- a/engines/wintermute/UI/UIEntity.h
+++ b/engines/wintermute/UI/UIEntity.h
@@ -39,7 +39,7 @@ public:
 	CUIEntity(CBGame *inGame);

 	virtual ~CUIEntity();

 	HRESULT loadFile(const char *filename);

-	HRESULT loadBuffer(byte  *Buffer, bool Complete);

+	HRESULT loadBuffer(byte *Buffer, bool Complete);

 	virtual HRESULT saveAsText(CBDynBuffer *buffer, int indent);

 

 	virtual HRESULT display(int OffsetX = 0, int OffsetY = 0);

diff --git a/engines/wintermute/graphics/tga.cpp b/engines/wintermute/graphics/tga.cpp
index 1c0d73c6cd..1bf4383ccf 100644
--- a/engines/wintermute/graphics/tga.cpp
+++ b/engines/wintermute/graphics/tga.cpp
@@ -145,7 +145,7 @@ bool TGA::readData(Common::SeekableReadStream &tga, byte imageType, byte pixelDe
 	} else if (imageType == 3) {
 		_surface.create(_surface.w, _surface.h, _surface.format);
 
-		byte  *data  = (byte *)_surface.pixels;
+		byte *data  = (byte *)_surface.pixels;
 		uint32 count = _surface.w * _surface.h;
 
 		while (count-- > 0) {