WINTERMUTE: Rename FuncName->funcName and VarName->varName mainly in AdGame. (But also all const char* Filename->filename)

3 files changed, 18 insertions, 18 deletions

diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp
index e511f52284..1e4b25e143 100644
--- a/engines/wintermute/video/VidPlayer.cpp
+++ b/engines/wintermute/video/VidPlayer.cpp
@@ -129,17 +129,17 @@ HRESULT CVidPlayer::initialize(const char *inFilename, const char *SubtitleFile)
 	cleanup();
 
 	char Filename[MAX_PATH];
-	Game->_fileManager->GetFullPath(inFilename, Filename);
+	Game->_fileManager->GetFullPath(inFilename, filename);
 
 	// open file
 	if (AVIFileOpen(&_aviFile, Filename, OF_READ, NULL) != 0) {
-		Game->LOG(0, "Error opening AVI file '%s'", Filename);
+		Game->LOG(0, "Error opening AVI file '%s'", filename);
 		return E_FAIL;
 	}
 
 	// get video stream
 	if (AVIFileGetStream(_aviFile, &_videoStream, streamtypeVIDEO, 0) != 0) {
-		Game->LOG(0, "Error finding video stream in AVI file '%s'", Filename);
+		Game->LOG(0, "Error finding video stream in AVI file '%s'", filename);
 		return E_FAIL;
 	}
 	_totalVideoTime = AVIStreamEndTime(_videoStream);
@@ -155,7 +155,7 @@ HRESULT CVidPlayer::initialize(const char *inFilename, const char *SubtitleFile)
 
 	// get video format
 	if (AVIStreamReadFormat(m_VideoStream, 0, NULL, &Size)) {
-		Game->LOG(0, "Error obtaining video stream format in AVI file '%s'", Filename);
+		Game->LOG(0, "Error obtaining video stream format in AVI file '%s'", filename);
 		return E_FAIL;
 	}
 	_videoFormat = (LPBITMAPINFO)new BYTE[Size];
@@ -176,7 +176,7 @@ HRESULT CVidPlayer::initialize(const char *inFilename, const char *SubtitleFile)
 		m_VidRenderer = new CVidRendererDD(Game);
 
 	if (!m_VidRenderer || FAILED(m_VidRenderer->Initialize(m_VideoFormat, m_TargetFormat))) {
-		Game->LOG(0, "Error initializing video renderer for AVI file '%s'", Filename);
+		Game->LOG(0, "Error initializing video renderer for AVI file '%s'", filename);
 		SAFE_DELETE(m_VidRenderer);
 		return E_FAIL;
 	}
@@ -190,14 +190,14 @@ HRESULT CVidPlayer::initialize(const char *inFilename, const char *SubtitleFile)
 		if (FAILED(res = _sound->InitializeBuffer(_audioStream))) {
 			SAFE_DELETE(_sound);
 			_soundAvailable = false;
-			Game->LOG(res, "Error initializing sound buffer for AVI file '%s'", Filename);
+			Game->LOG(res, "Error initializing sound buffer for AVI file '%s'", filename);
 		}
 	}
 
 	if (Game->_videoSubtitles) LoadSubtitles(inFilename, SubtitleFile);
 
-	_filename = new char[strlen(Filename) + 1];
-	if (_filename) strcpy(_filename, Filename);
+	_filename = new char[strlen(filename) + 1];
+	if (_filename) strcpy(_filename, filename);
 #endif
 	return S_OK;
 }
@@ -378,7 +378,7 @@ bool CVidPlayer::isPlaying() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CVidPlayer::loadSubtitles(const char *Filename, const char *SubtitleFile) {
+HRESULT CVidPlayer::loadSubtitles(const char *filename, const char *SubtitleFile) {
 #if 0
 	if (!Filename) return S_OK;
 
@@ -390,7 +390,7 @@ HRESULT CVidPlayer::loadSubtitles(const char *Filename, const char *SubtitleFile
 	if (SubtitleFile) {
 		strcpy(NewFile, SubtitleFile);
 	} else {
-		_splitpath(Filename, drive, dir, fname, NULL);
+		_splitpath(filename, drive, dir, fname, NULL);
 		_makepath(NewFile, drive, dir, fname, ".SUB");
 	}
 
diff --git a/engines/wintermute/video/VidPlayer.h b/engines/wintermute/video/VidPlayer.h
index f3dfa97e33..b1afa080bd 100644
--- a/engines/wintermute/video/VidPlayer.h
+++ b/engines/wintermute/video/VidPlayer.h
@@ -46,7 +46,7 @@ class CVidPlayer : public CBBase {
 public:
 	bool _showSubtitle;
 	int _currentSubtitle;
-	HRESULT loadSubtitles(const char *Filename, const char *SubtitleFile);
+	HRESULT loadSubtitles(const char *filename, const char *SubtitleFile);
 	bool _slowRendering;
 	bool isPlaying();
 	char *_filename;
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index d47f3b3ae5..b8a9886105 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -140,7 +140,7 @@ HRESULT CVidTheoraPlayer::initialize(const Common::String &filename, const Commo
 	_file = Game->_fileManager->openFile(filename, true, false);
 	if (!_file) return E_FAIL;
 
-	//if (Filename != _filename) CBUtils::setString(&_filename, Filename);
+	//if (Filename != _filename) CBUtils::setString(&_filename, filename);
 #if defined (USE_THEORADEC)
 	_theoraDecoder = new TheoraDecoder();
 #else
@@ -164,10 +164,10 @@ HRESULT CVidTheoraPlayer::initialize(const Common::String &filename, const Commo
 #if 0
 	cleanup();
 
-	_file = Game->_fileManager->openFile(Filename);
+	_file = Game->_fileManager->openFile(filename);
 	if (!_file) return E_FAIL;
 
-	if (Filename != _filename) CBUtils::setString(&_filename, Filename);
+	if (Filename != _filename) CBUtils::setString(&_filename, filename);
 
 	// start up Ogg stream synchronization layer
 	ogg_sync_init(&m_OggSyncState);
@@ -303,7 +303,7 @@ HRESULT CVidTheoraPlayer::initialize(const Common::String &filename, const Commo
 		if (FAILED(Res = m_Sound->InitializeBuffer(this))) {
 			Game->m_SoundMgr->RemoveSound(m_Sound);
 			m_Sound = NULL;
-			Game->LOG(Res, "Error initializing sound buffer for Theora file '%s'", Filename);
+			Game->LOG(Res, "Error initializing sound buffer for Theora file '%s'", filename);
 		} else {
 			SAFE_DELETE_ARRAY(m_AudioBuf);
 			m_AudioBufSize = m_Sound->m_StreamBlockSize;
@@ -325,7 +325,7 @@ HRESULT CVidTheoraPlayer::initialize(const Common::String &filename, const Commo
 
 
 	if (!m_Subtitler) m_Subtitler = new CVidSubtitler(Game);
-	if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->LoadSubtitles(Filename, SubtitleFile);
+	if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->LoadSubtitles(filename, SubtitleFile);
 
 	return Res;
 #endif
@@ -686,12 +686,12 @@ HRESULT CVidTheoraPlayer::setAlphaImage(const Common::String &filename) {
 #if 0
 	SAFE_DELETE(m_AlphaImage);
 	m_AlphaImage = new CBImage(Game);
-	if (!m_AlphaImage || FAILED(m_AlphaImage->loadFile(Filename))) {
+	if (!m_AlphaImage || FAILED(m_AlphaImage->loadFile(filename))) {
 		SAFE_DELETE(m_AlphaImage);
 		SAFE_DELETE_ARRAY(m_AlphaFilename);
 		return E_FAIL;
 	}
-	if (m_AlphaFilename != Filename) CBUtils::setString(&m_AlphaFilename, Filename);
+	if (m_AlphaFilename != Filename) CBUtils::setString(&m_AlphaFilename, filename);
 	m_AlphaImage->Convert(IMG_TRUECOLOR);
 #endif
 	return S_OK;