WINTERMUTE: Rename FuncName->funcName in AdTalkNode, AdTalkHolder, AdTalkDef, AdSpriteSet, AdSentence and AdSceneState

24 files changed, 69 insertions, 69 deletions

diff --git a/engines/wintermute/Base/BFont.cpp b/engines/wintermute/Base/BFont.cpp
index 5a6513d7d3..22b0c0f1a0 100644
--- a/engines/wintermute/Base/BFont.cpp
+++ b/engines/wintermute/Base/BFont.cpp
@@ -71,7 +71,7 @@ int CBFont::GetTextWidth(byte  *text, int MaxLenght) {
 

 /*

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

-HRESULT CBFont::LoadFile(const char * Filename)

+HRESULT CBFont::loadFile(const char * Filename)

 {

     BYTE* Buffer = Game->_fileManager->readWholeFile(Filename);

     if(Buffer==NULL){

@@ -84,7 +84,7 @@ HRESULT CBFont::LoadFile(const char * Filename)
     _filename = new char [strlen(Filename)+1];

     strcpy(_filename, Filename);

 

-    if(FAILED(ret = LoadBuffer(Buffer))) Game->LOG(0, "Error parsing FONT file '%s'", Filename);

+    if(FAILED(ret = loadBuffer(Buffer))) Game->LOG(0, "Error parsing FONT file '%s'", Filename);

 

     delete [] Buffer;

 

@@ -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)

@@ -156,7 +156,7 @@ CBFont *CBFont::CreateFromFile(CBGame *Game, const char *Filename) {
 	if (IsTrueType(Game, Filename)) {

 		CBFontTT *Font = new CBFontTT(Game);

 		if (Font) {

-			if (FAILED(Font->LoadFile(Filename))) {

+			if (FAILED(Font->loadFile(Filename))) {

 				delete Font;

 				return NULL;

 			}

@@ -165,7 +165,7 @@ CBFont *CBFont::CreateFromFile(CBGame *Game, const char *Filename) {
 	} else {

 		CBFontBitmap *Font = new CBFontBitmap(Game);

 		if (Font) {

-			if (FAILED(Font->LoadFile(Filename))) {

+			if (FAILED(Font->loadFile(Filename))) {

 				delete Font;

 				return NULL;

 			}

diff --git a/engines/wintermute/Base/BFont.h b/engines/wintermute/Base/BFont.h
index 148cbe7ed8..7a115517da 100644
--- a/engines/wintermute/Base/BFont.h
+++ b/engines/wintermute/Base/BFont.h
@@ -51,8 +51,8 @@ public:
 	static CBFont *CreateFromFile(CBGame *Game, const char *Filename);

 

 private:

-	//HRESULT LoadBuffer(byte * Buffer);

-	//HRESULT LoadFile(const char* Filename);

+	//HRESULT loadBuffer(byte * Buffer);

+	//HRESULT loadFile(const char* Filename);

 	static bool IsTrueType(CBGame *Game, const char *Filename);

 };

 

diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 31a667bcbe..eb30bfa6f5 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -245,7 +245,7 @@ void CBFontBitmap::DrawChar(byte  c, int x, int y) {
 

 

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

-HRESULT CBFontBitmap::LoadFile(const char *Filename) {

+HRESULT CBFontBitmap::loadFile(const char *Filename) {

 	byte *Buffer = Game->_fileManager->readWholeFile(Filename);

 	if (Buffer == NULL) {

 		Game->LOG(0, "CBFontBitmap::LoadFile failed for file '%s'", Filename);

@@ -257,7 +257,7 @@ HRESULT CBFontBitmap::LoadFile(const char *Filename) {
 	_filename = new char [strlen(Filename) + 1];

 	strcpy(_filename, Filename);

 

-	if (FAILED(ret = LoadBuffer(Buffer))) Game->LOG(0, "Error parsing FONT file '%s'", Filename);

+	if (FAILED(ret = loadBuffer(Buffer))) Game->LOG(0, "Error parsing FONT file '%s'", Filename);

 

 	delete [] Buffer;

 

@@ -284,7 +284,7 @@ TOKEN_DEF(WIDTHS_FRAME)
 TOKEN_DEF(PAINT_WHOLE_CELL)

 TOKEN_DEF_END

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

-HRESULT CBFontBitmap::LoadBuffer(byte  *Buffer) {

+HRESULT CBFontBitmap::loadBuffer(byte  *Buffer) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(FONTEXT_FIX)

 	TOKEN_TABLE(FONT)

@@ -404,7 +404,7 @@ HRESULT CBFontBitmap::LoadBuffer(byte  *Buffer) {
 	if (sprite_file != NULL) {

 		delete _sprite;

 		_sprite = new CBSprite(Game, this);

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

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

 			delete _sprite;

 			_sprite = NULL;

 		}

diff --git a/engines/wintermute/Base/BFontBitmap.h b/engines/wintermute/Base/BFontBitmap.h
index e22540b3c1..64fffb7a12 100644
--- a/engines/wintermute/Base/BFontBitmap.h
+++ b/engines/wintermute/Base/BFontBitmap.h
@@ -37,8 +37,8 @@ class CBSubFrame;
 class CBFontBitmap : public CBFont {

 public:

 	DECLARE_PERSISTENT(CBFontBitmap, CBFont)

-	HRESULT LoadBuffer(byte  *Buffer);

-	HRESULT LoadFile(const char *Filename);

+	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);

diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp
index 3244dfa332..9996f9b3e2 100644
--- a/engines/wintermute/Base/BFontStorage.cpp
+++ b/engines/wintermute/Base/BFontStorage.cpp
@@ -104,7 +104,7 @@ CBFont *CBFontStorage::AddFont(const char *Filename) {
 	CBFont* font = new CBFont(Game);

 	if (!font) return NULL;

 

-	if (FAILED(font->LoadFile(Filename))) {

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

 	    delete font;

 	    return NULL;

 	}

diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index fb3b6e3fb1..5a44a0fc13 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -404,7 +404,7 @@ int CBFontTT::GetLetterHeight() {
 

 

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

-HRESULT CBFontTT::LoadFile(const char *Filename) {

+HRESULT CBFontTT::loadFile(const char *Filename) {

 	byte *Buffer = Game->_fileManager->readWholeFile(Filename);

 	if (Buffer == NULL) {

 		Game->LOG(0, "CBFontTT::LoadFile failed for file '%s'", Filename);

@@ -416,7 +416,7 @@ HRESULT CBFontTT::LoadFile(const char *Filename) {
 	_filename = new char [strlen(Filename) + 1];

 	strcpy(_filename, Filename);

 

-	if (FAILED(ret = LoadBuffer(Buffer))) Game->LOG(0, "Error parsing TTFONT file '%s'", Filename);

+	if (FAILED(ret = loadBuffer(Buffer))) Game->LOG(0, "Error parsing TTFONT file '%s'", Filename);

 

 	delete [] Buffer;

 

@@ -441,7 +441,7 @@ TOKEN_DEF(OFFSET_X)
 TOKEN_DEF(OFFSET_Y)

 TOKEN_DEF_END

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

-HRESULT CBFontTT::LoadBuffer(byte  *Buffer) {

+HRESULT CBFontTT::loadBuffer(byte  *Buffer) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(TTFONT)

 	TOKEN_TABLE(SIZE)

diff --git a/engines/wintermute/Base/BFontTT.h b/engines/wintermute/Base/BFontTT.h
index db5b029c93..4d1f52279c 100644
--- a/engines/wintermute/Base/BFontTT.h
+++ b/engines/wintermute/Base/BFontTT.h
@@ -123,8 +123,8 @@ public:
 	virtual void DrawText(byte  *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLenght = -1);

 	virtual int GetLetterHeight();

 

-	HRESULT LoadBuffer(byte *buffer);

-	HRESULT LoadFile(const char *filename);

+	HRESULT loadBuffer(byte *buffer);

+	HRESULT loadFile(const char *filename);

 

 	float GetLineHeight() const {

 		return _lineHeight;

diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index 35e6ca814b..b7526d4da9 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 752e0c6925..a9030b8848 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 625c154d7d..6db323b333 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -390,7 +390,7 @@ HRESULT CBGame::cleanup() {
 

 	for (int i = 0; i < _scripts.GetSize(); i++) {

 		_scripts[i]->_owner = NULL;

-		_scripts[i]->Finish();

+		_scripts[i]->finish();

 	}

 	_scripts.RemoveAll();

 

@@ -687,7 +687,7 @@ void CBGame::GetOffset(int *OffsetX, int *OffsetY) {
 

 

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

-HRESULT CBGame::LoadFile(const char *Filename) {

+HRESULT CBGame::loadFile(const char *Filename) {

 	byte *Buffer = Game->_fileManager->readWholeFile(Filename);

 	if (Buffer == NULL) {

 		Game->LOG(0, "CBGame::LoadFile failed for file '%s'", Filename);

@@ -699,7 +699,7 @@ HRESULT CBGame::LoadFile(const char *Filename) {
 	_filename = new char [strlen(Filename) + 1];

 	strcpy(_filename, Filename);

 

-	if (FAILED(ret = LoadBuffer(Buffer, true))) Game->LOG(0, "Error parsing GAME file '%s'", Filename);

+	if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing GAME file '%s'", Filename);

 

 

 	delete [] Buffer;

@@ -758,7 +758,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)

@@ -809,7 +809,7 @@ HRESULT CBGame::LoadBuffer(byte  *Buffer, bool Complete) {
 	while ((cmd = parser.GetCommand((char **)&Buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

-			if (FAILED(LoadFile((char *)params))) cmd = PARSERR_GENERIC;

+			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_NAME:

@@ -838,7 +838,7 @@ HRESULT CBGame::LoadBuffer(byte  *Buffer, bool Complete) {
 		case TOKEN_CURSOR:

 			delete _cursor;

 			_cursor = new CBSprite(Game);

-			if (!_cursor || FAILED(_cursor->LoadFile((char *)params))) {

+			if (!_cursor || FAILED(_cursor->loadFile((char *)params))) {

 				delete _cursor;

 				_cursor = NULL;

 				cmd = PARSERR_GENERIC;

@@ -849,7 +849,7 @@ HRESULT CBGame::LoadBuffer(byte  *Buffer, bool Complete) {
 			delete _activeCursor;

 			_activeCursor = NULL;

 			_activeCursor = new CBSprite(Game);

-			if (!_activeCursor || FAILED(_activeCursor->LoadFile((char *)params))) {

+			if (!_activeCursor || FAILED(_activeCursor->loadFile((char *)params))) {

 				delete _activeCursor;

 				_activeCursor = NULL;

 				cmd = PARSERR_GENERIC;

@@ -859,7 +859,7 @@ HRESULT CBGame::LoadBuffer(byte  *Buffer, bool Complete) {
 		case TOKEN_NONINTERACTIVE_CURSOR:

 			delete _cursorNoninteractive;

 			_cursorNoninteractive = new CBSprite(Game);

-			if (!_cursorNoninteractive || FAILED(_cursorNoninteractive->LoadFile((char *)params))) {

+			if (!_cursorNoninteractive || FAILED(_cursorNoninteractive->loadFile((char *)params))) {

 				delete _cursorNoninteractive;

 				_cursorNoninteractive = NULL;

 				cmd = PARSERR_GENERIC;

@@ -1034,7 +1034,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS
 		if (Val->IsNULL()) ClearOld = true;

 		else ClearOld = Val->GetBool();

 

-		if (FAILED(_stringTable->LoadFile(Filename, ClearOld)))

+		if (FAILED(_stringTable->loadFile(Filename, ClearOld)))

 			Stack->PushBool(false);

 		else

 			Stack->PushBool(true);

@@ -1086,7 +1086,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS
 	else if (strcmp(Name, "LoadWindow") == 0) {

 		Stack->CorrectParams(1);

 		CUIWindow *win = new CUIWindow(Game);

-		if (win && SUCCEEDED(win->LoadFile(Stack->Pop()->GetString()))) {

+		if (win && SUCCEEDED(win->loadFile(Stack->Pop()->GetString()))) {

 			_windows.Add(win);

 			RegisterObject(win);

 			Stack->PushNative(win, true);

@@ -1994,7 +1994,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS
 

 		delete _loadingIcon;

 		_loadingIcon = new CBSprite(this);

-		if (!_loadingIcon || FAILED(_loadingIcon->LoadFile(Filename))) {

+		if (!_loadingIcon || FAILED(_loadingIcon->loadFile(Filename))) {

 			delete _loadingIcon;

 			_loadingIcon = NULL;

 		} else {

@@ -3542,7 +3542,7 @@ HRESULT CBGame::LoadSettings(const char *Filename) {
 			break;

 

 		case TOKEN_STRING_TABLE:

-			if (FAILED(_stringTable->LoadFile((char *)params))) cmd = PARSERR_GENERIC;

+			if (FAILED(_stringTable->loadFile((char *)params))) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_RESOLUTION:

@@ -4208,7 +4208,7 @@ HRESULT CBGame::SetWaitCursor(const char *Filename) {
 	_cursorNoninteractive = NULL;

 

 	_cursorNoninteractive = new CBSprite(Game);

-	if (!_cursorNoninteractive || FAILED(_cursorNoninteractive->LoadFile(Filename))) {

+	if (!_cursorNoninteractive || FAILED(_cursorNoninteractive->loadFile(Filename))) {

 		delete _cursorNoninteractive;

 		_cursorNoninteractive = NULL;

 		return E_FAIL;

diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/Base/BGame.h
index 51f792dc75..6c5776ef2e 100644
--- a/engines/wintermute/Base/BGame.h
+++ b/engines/wintermute/Base/BGame.h
@@ -193,8 +193,8 @@ public:
 

 	void *_dEBUG_LogFile;

 	int _sequence;

-	virtual HRESULT LoadFile(const char *Filename);

-	virtual HRESULT LoadBuffer(byte  *Buffer, bool Complete = true);

+	virtual HRESULT loadFile(const char *Filename);

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

 	CBArray<CBQuickMsg *, CBQuickMsg *> _quickMessages;

 	CBArray<CUIWindow *, CUIWindow *> _windows;

 	CBArray<CBViewport *, CBViewport *> _viewportStack;

diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp
index 7c3acd83a7..6512a1f163 100644
--- a/engines/wintermute/Base/BObject.cpp
+++ b/engines/wintermute/Base/BObject.cpp
@@ -927,7 +927,7 @@ HRESULT CBObject::setCursor(const char *filename) {
 

 	_sharedCursors = false;

 	_cursor = new CBSprite(Game);

-	if (!_cursor || FAILED(_cursor->LoadFile(filename))) {

+	if (!_cursor || FAILED(_cursor->loadFile(filename))) {

 		delete _cursor;

 		_cursor = NULL;

 		return E_FAIL;

@@ -939,7 +939,7 @@ HRESULT CBObject::setCursor(const char *filename) {
 HRESULT CBObject::setActiveCursor(const char *filename) {

 	delete _activeCursor;

 	_activeCursor = new CBSprite(Game);

-	if (!_activeCursor || FAILED(_activeCursor->LoadFile(filename))) {

+	if (!_activeCursor || FAILED(_activeCursor->loadFile(filename))) {

 		delete _activeCursor;

 		_activeCursor = NULL;

 		return E_FAIL;

diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index c66ee67e17..6fc11cb8a8 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -95,7 +95,7 @@ bool CBRegion::PointInRegion(int X, int Y) {
 

 

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

-HRESULT CBRegion::LoadFile(const char *Filename) {

+HRESULT CBRegion::loadFile(const char *Filename) {

 	byte *Buffer = Game->_fileManager->readWholeFile(Filename);

 	if (Buffer == NULL) {

 		Game->LOG(0, "CBRegion::LoadFile failed for file '%s'", Filename);

@@ -107,7 +107,7 @@ HRESULT CBRegion::LoadFile(const char *Filename) {
 	_filename = new char [strlen(Filename) + 1];

 	strcpy(_filename, Filename);

 

-	if (FAILED(ret = LoadBuffer(Buffer, true))) Game->LOG(0, "Error parsing REGION file '%s'", Filename);

+	if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing REGION file '%s'", Filename);

 

 

 	delete [] Buffer;

@@ -128,7 +128,7 @@ TOKEN_DEF(EDITOR_SELECTED_POINT)
 TOKEN_DEF(PROPERTY)

 TOKEN_DEF_END

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

-HRESULT CBRegion::LoadBuffer(byte  *Buffer, bool Complete) {

+HRESULT CBRegion::loadBuffer(byte  *Buffer, bool Complete) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(REGION)

 	TOKEN_TABLE(TEMPLATE)

@@ -161,7 +161,7 @@ HRESULT CBRegion::LoadBuffer(byte  *Buffer, bool Complete) {
 	while ((cmd = parser.GetCommand((char **)&Buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

-			if (FAILED(LoadFile((char *)params))) cmd = PARSERR_GENERIC;

+			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_NAME:

diff --git a/engines/wintermute/Base/BRegion.h b/engines/wintermute/Base/BRegion.h
index f52f646f2c..6e8f8bbbb2 100644
--- a/engines/wintermute/Base/BRegion.h
+++ b/engines/wintermute/Base/BRegion.h
@@ -50,8 +50,8 @@ public:
 	virtual ~CBRegion();

 	bool PointInRegion(int X, int Y);

 	bool CreateRegion();

-	HRESULT LoadFile(const char *Filename);

-	HRESULT LoadBuffer(byte  *Buffer, bool Complete = true);

+	HRESULT loadFile(const char *Filename);

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

 	RECT _rect;

 	CBArray<CBPoint *, CBPoint *> _points;

 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride = NULL);

diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp
index aaf73b2bc2..0b9bc27958 100644
--- a/engines/wintermute/Base/BScriptHolder.cpp
+++ b/engines/wintermute/Base/BScriptHolder.cpp
@@ -62,7 +62,7 @@ HRESULT CBScriptHolder::cleanup() {
 	int i;

 

 	for (i = 0; i < _scripts.GetSize(); i++) {

-		_scripts[i]->Finish(true);

+		_scripts[i]->finish(true);

 		_scripts[i]->_owner = NULL;

 	}

 	_scripts.RemoveAll();

@@ -177,7 +177,7 @@ HRESULT CBScriptHolder::scCallMethod(CScScript *Script, CScStack *Stack, CScStac
 		bool ret = false;

 		for (int i = 0; i < _scripts.GetSize(); i++) {

 			if (scumm_stricmp(_scripts[i]->_filename, Filename) == 0) {

-				_scripts[i]->Finish(KillThreads);

+				_scripts[i]->finish(KillThreads);

 				ret = true;

 				break;

 			}

diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 6f23649737..e31cb80d7c 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -122,12 +122,12 @@ HRESULT CBSprite::Draw(int X, int Y, CBObject *Register, float ZoomX, float Zoom
 

 

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

-HRESULT CBSprite::LoadFile(const char *Filename, int LifeTime, TSpriteCacheType CacheType) {

+HRESULT CBSprite::loadFile(const char *Filename, int LifeTime, TSpriteCacheType CacheType) {

 	Common::SeekableReadStream *File = Game->_fileManager->openFile(Filename);

 	if (!File) {

 		Game->LOG(0, "CBSprite::LoadFile failed for file '%s'", Filename);

-		if (Game->_dEBUG_DebugMode) return LoadFile("invalid_debug.bmp", LifeTime, CacheType);

-		else return LoadFile("invalid.bmp", LifeTime, CacheType);

+		if (Game->_dEBUG_DebugMode) return loadFile("invalid_debug.bmp", LifeTime, CacheType);

+		else return loadFile("invalid.bmp", LifeTime, CacheType);

 	} else {

 		Game->_fileManager->closeFile(File);

 		File = NULL;

@@ -155,7 +155,7 @@ HRESULT CBSprite::LoadFile(const char *Filename, int LifeTime, TSpriteCacheType
 	} else {

 		byte *Buffer = Game->_fileManager->readWholeFile(Filename);

 		if (Buffer) {

-			if (FAILED(ret = LoadBuffer(Buffer, true, LifeTime, CacheType))) Game->LOG(0, "Error parsing SPRITE file '%s'", Filename);

+			if (FAILED(ret = loadBuffer(Buffer, true, LifeTime, CacheType))) Game->LOG(0, "Error parsing SPRITE file '%s'", Filename);

 			delete [] Buffer;

 		}

 	}

@@ -187,7 +187,7 @@ TOKEN_DEF(EDITOR_BG_ALPHA)
 TOKEN_DEF(EDITOR_PROPERTY)

 TOKEN_DEF_END

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

-HRESULT CBSprite::LoadBuffer(byte  *Buffer, bool Complete, int LifeTime, TSpriteCacheType CacheType) {

+HRESULT CBSprite::loadBuffer(byte  *Buffer, bool Complete, int LifeTime, TSpriteCacheType CacheType) {

 	TOKEN_TABLE_START(commands)

 	TOKEN_TABLE(CONTINUOUS)

 	TOKEN_TABLE(SPRITE)

@@ -289,7 +289,7 @@ HRESULT CBSprite::LoadBuffer(byte  *Buffer, bool Complete, int LifeTime, TSprite
 

 			frame = new CBFrame(Game);

 

-			if (FAILED(frame->LoadBuffer(params, FrameLifeTime, _streamedKeepLoaded))) {

+			if (FAILED(frame->loadBuffer(params, FrameLifeTime, _streamedKeepLoaded))) {

 				delete frame;

 				Game->LOG(0, "Error parsing frame %d", frame_count);

 				return E_FAIL;

diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/Base/BSprite.h
index 67f703d744..1e35a1555f 100644
--- a/engines/wintermute/Base/BSprite.h
+++ b/engines/wintermute/Base/BSprite.h
@@ -66,8 +66,8 @@ public:
 	bool _changed;

 	bool _paused;

 	bool _finished;

-	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);

+	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);

 	bool _looping;

diff --git a/engines/wintermute/Base/BStringTable.cpp b/engines/wintermute/Base/BStringTable.cpp
index 2136bc4d94..794af32ab7 100644
--- a/engines/wintermute/Base/BStringTable.cpp
+++ b/engines/wintermute/Base/BStringTable.cpp
@@ -169,7 +169,7 @@ const char *CBStringTable::ExpandStatic(const char *String, bool ForceExpand) {
 

 

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

-HRESULT CBStringTable::LoadFile(const char *Filename, bool ClearOld) {

+HRESULT CBStringTable::loadFile(const char *Filename, bool ClearOld) {

 	Game->LOG(0, "Loading string table...");

 

 	if (ClearOld) _strings.clear();

diff --git a/engines/wintermute/Base/BStringTable.h b/engines/wintermute/Base/BStringTable.h
index 57c75ef1e9..7a6177098c 100644
--- a/engines/wintermute/Base/BStringTable.h
+++ b/engines/wintermute/Base/BStringTable.h
@@ -38,7 +38,7 @@ namespace WinterMute {
 class CBStringTable : public CBBase {

 public:

 	const char *ExpandStatic(const char *String, bool ForceExpand = false);

-	HRESULT LoadFile(const char *Filename, bool DeleteAll = true);

+	HRESULT loadFile(const char *Filename, bool DeleteAll = true);

 	void Expand(char **Str, bool ForceExpand = false);

 	HRESULT AddString(const char *Key, const char *Val, bool ReportDuplicities = true);

 	CBStringTable(CBGame *inGame);

diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp
index 4b1475f780..3443bcbb71 100644
--- a/engines/wintermute/Base/PartParticle.cpp
+++ b/engines/wintermute/Base/PartParticle.cpp
@@ -83,7 +83,7 @@ HRESULT CPartParticle::setSprite(const char *Filename) {
 

 	CSysClassRegistry::GetInstance()->_disabled = true;

 	_sprite = new CBSprite(Game, Game);

-	if (_sprite && SUCCEEDED(_sprite->LoadFile(Filename))) {

+	if (_sprite && SUCCEEDED(_sprite->loadFile(Filename))) {

 		CSysClassRegistry::GetInstance()->_disabled = false;

 		return S_OK;

 	} else {

diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp
index a28a35948f..0835566d2c 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/Base/scriptables/ScEngine.cpp
@@ -189,7 +189,7 @@ HRESULT CScEngine::cleanup() {
 

 

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

-byte *WINAPI CScEngine::LoadFile(void *Data, char *Filename, uint32 *Size) {

+byte *WINAPI CScEngine::loadFile(void *Data, char *Filename, uint32 *Size) {

 	CBGame *Game = (CBGame *)Data;

 	return Game->_fileManager->readWholeFile(Filename, Size);

 }

@@ -309,7 +309,7 @@ byte *CScEngine::GetCompiledScript(const char *Filename, uint32 *OutSize, bool I
 		CALLBACKS c;

 		c.Dll_AddError = AddError;

 		c.Dll_CloseFile = CloseFile;

-		c.Dll_LoadFile = LoadFile;

+		c.Dll_LoadFile = loadFile;

 		c.Dll_ParseElement = ParseElement;

 		ExtSetCallbacks(&c, Game);

 

@@ -387,11 +387,11 @@ HRESULT CScEngine::Tick() {
 			        break;

 			    }

 			}

-			if(!obj_found) _scripts[i]->Finish(); // _waitObject no longer exists

+			if(!obj_found) _scripts[i]->finish(); // _waitObject no longer exists

 			*/

 			if (Game->ValidObject(_scripts[i]->_waitObject)) {

 				if (_scripts[i]->_waitObject->isReady()) _scripts[i]->Run();

-			} else _scripts[i]->Finish();

+			} else _scripts[i]->finish();

 			break;

 		}

 

@@ -415,7 +415,7 @@ HRESULT CScEngine::Tick() {
 					// copy return value

 					_scripts[i]->_stack->Push(_scripts[i]->_waitScript->_stack->Pop());

 					_scripts[i]->Run();

-					_scripts[i]->_waitScript->Finish();

+					_scripts[i]->_waitScript->finish();

 					_scripts[i]->_waitScript = NULL;

 				}

 			}

@@ -475,7 +475,7 @@ HRESULT CScEngine::TickUnbreakable() {
 			_currentScript = _scripts[i];

 			_scripts[i]->ExecuteInstruction();

 		}

-		_scripts[i]->Finish();

+		_scripts[i]->finish();

 		_currentScript = NULL;

 	}

 	RemoveFinishedScripts();

@@ -552,7 +552,7 @@ HRESULT CScEngine::ResetObject(CBObject *Object) {
 			if (!Game->_compatKillMethodThreads) ResetScript(_scripts[i]);

 

 			bool IsThread = _scripts[i]->_methodThread || _scripts[i]->_thread;

-			_scripts[i]->Finish(!IsThread); // 1.9b1 - top-level script kills its threads as well

+			_scripts[i]->finish(!IsThread); // 1.9b1 - top-level script kills its threads as well

 		}

 	}

 	return S_OK;

@@ -563,7 +563,7 @@ HRESULT CScEngine::ResetScript(CScScript *Script) {
 	// terminate all scripts waiting for this script

 	for (int i = 0; i < _scripts.GetSize(); i++) {

 		if (_scripts[i]->_state == SCRIPT_WAITING_SCRIPT && _scripts[i]->_waitScript == Script) {

-			_scripts[i]->Finish();

+			_scripts[i]->finish();

 		}

 	}

 	return S_OK;

diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h
index 06417793ed..c7fb8eb3a8 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.h
+++ b/engines/wintermute/Base/scriptables/ScEngine.h
@@ -137,7 +137,7 @@ public:
 	CScEngine(CBGame *inGame);

 	virtual ~CScEngine();

 	static void WINAPI AddError(void *Data, int Line, char *Text);

-	static byte *WINAPI LoadFile(void *Data, char *Filename, uint32 *Size);

+	static byte *WINAPI loadFile(void *Data, char *Filename, uint32 *Size);

 	static void  WINAPI CloseFile(void *Data, byte *Buffer);

 	static void WINAPI ParseElement(void *Data, int Line, int Type, void *ElementData);

 	DLL_COMPILE_BUFFER  ExtCompileBuffer;

diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp
index aa3485030e..77c3784ef4 100644
--- a/engines/wintermute/Base/scriptables/ScScript.cpp
+++ b/engines/wintermute/Base/scriptables/ScScript.cpp
@@ -1117,7 +1117,7 @@ HRESULT CScScript::Sleep(uint32 Duration) {
 

 

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

-HRESULT CScScript::Finish(bool IncludingThreads) {

+HRESULT CScScript::finish(bool IncludingThreads) {

 	if (_state != SCRIPT_FINISHED && IncludingThreads) {

 		_state = SCRIPT_FINISHED;

 		FinishThreads();

@@ -1508,7 +1508,7 @@ HRESULT CScScript::FinishThreads() {
 	for (int i = 0; i < _engine->_scripts.GetSize(); i++) {

 		CScScript *Scr = _engine->_scripts[i];

 		if (Scr->_thread && Scr->_state != SCRIPT_FINISHED && Scr->_owner == _owner && scumm_stricmp(Scr->_filename, _filename) == 0)

-			Scr->Finish(true);

+			Scr->finish(true);

 	}

 	return S_OK;

 }

diff --git a/engines/wintermute/Base/scriptables/ScScript.h b/engines/wintermute/Base/scriptables/ScScript.h
index 24cc4debdf..1ed08375d1 100644
--- a/engines/wintermute/Base/scriptables/ScScript.h
+++ b/engines/wintermute/Base/scriptables/ScScript.h
@@ -77,7 +77,7 @@ public:
 	DECLARE_PERSISTENT(CScScript, CBBase)

 	void RuntimeError(LPCSTR fmt, ...);

 	HRESULT Run();

-	HRESULT Finish(bool IncludingThreads = false);

+	HRESULT finish(bool IncludingThreads = false);

 	HRESULT Sleep(uint32 Duration);

 	HRESULT WaitForExclusive(CBObject *Object);

 	HRESULT WaitFor(CBObject *Object);