WINTERMUTE: Fix a few more warnings

5 files changed, 9 insertions, 7 deletions

diff --git a/engines/wintermute/BGame.cpp b/engines/wintermute/BGame.cpp
index fa2e19a3c7..a447b7a0f8 100644
--- a/engines/wintermute/BGame.cpp
+++ b/engines/wintermute/BGame.cpp
@@ -3148,7 +3148,7 @@ HRESULT CBGame::ShowCursor() {
 

 

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

-HRESULT CBGame::SaveGame(int slot, char *desc, bool quickSave) {

+HRESULT CBGame::SaveGame(int slot, const char *desc, bool quickSave) {

 	char Filename[MAX_PATH + 1];

 	GetSaveSlotFilename(slot, Filename);

 

@@ -3793,10 +3793,10 @@ void CBGame::SetWindowTitle() {
 			/*          WideString wstr = StringUtil::AnsiToWide(Title);

 			            title = StringUtil::WideToUtf8(wstr);*/

 		}

-

+#if 0

 		CBRenderSDL *renderer = static_cast<CBRenderSDL *>(_renderer);

 		// TODO

-#if 0

+

 		SDL_SetWindowTitle(renderer->GetSdlWindow(), title.c_str());

 #endif

 	}

diff --git a/engines/wintermute/BGame.h b/engines/wintermute/BGame.h
index de98897a3d..8b0797825d 100644
--- a/engines/wintermute/BGame.h
+++ b/engines/wintermute/BGame.h
@@ -293,7 +293,7 @@ public:
 	virtual HRESULT Cleanup();

 	virtual HRESULT LoadGame(int Slot);

 	virtual HRESULT LoadGame(const char *Filename);

-	virtual HRESULT SaveGame(int slot, char *desc, bool quickSave = false);

+	virtual HRESULT SaveGame(int slot, const char *desc, bool quickSave = false);

 	virtual HRESULT ShowCursor();

 

 	CBSprite *_cursorNoninteractive;

diff --git a/engines/wintermute/BImage.cpp b/engines/wintermute/BImage.cpp
index 869d029e27..5f85215f7a 100644
--- a/engines/wintermute/BImage.cpp
+++ b/engines/wintermute/BImage.cpp
@@ -101,6 +101,7 @@ byte *CBImage::CreateBMPBuffer(uint32 *BufferSize) {
 

 	return Buffer;

 #endif

+	return NULL;

 }

 

 

diff --git a/engines/wintermute/BSoundBuffer.cpp b/engines/wintermute/BSoundBuffer.cpp
index 1905325f8a..6b689f59ca 100644
--- a/engines/wintermute/BSoundBuffer.cpp
+++ b/engines/wintermute/BSoundBuffer.cpp
@@ -204,8 +204,8 @@ HRESULT CBSoundBuffer::Resume() {
 	if (_stream) {

 		BASS_ChannelPlay(_stream, FALSE);

 	}

-	return S_OK;

 #endif

+	return S_OK;

 }

 

 

@@ -237,6 +237,7 @@ uint32 CBSoundBuffer::GetLength() {
 	QWORD len = BASS_ChannelGetLength(_stream, BASS_POS_BYTE);

 	return 1000 * BASS_ChannelBytes2Seconds(_stream, len);

 #endif

+	return 0;

 }

 

 

diff --git a/engines/wintermute/scriptables/ScEngine.cpp b/engines/wintermute/scriptables/ScEngine.cpp
index 4edb1c771b..67e9f9eef0 100644
--- a/engines/wintermute/scriptables/ScEngine.cpp
+++ b/engines/wintermute/scriptables/ScEngine.cpp
@@ -80,7 +80,7 @@ CScEngine::CScEngine(CBGame *inGame): CBBase(inGame) {
 			::FreeLibrary(_compilerDLL);

 			_compilerDLL = NULL;

 		} else {

-			/*

+		*/	/*

 			// publish external methods to the compiler

 			CALLBACKS c;

 			c.Dll_AddError = AddError;

@@ -759,7 +759,7 @@ HRESULT CScEngine::SaveBreakpoints() {
 		for (int j = 0; j < _breakpoints[i]->_lines.GetSize(); j++) {

 			Count++;

 			sprintf(Key, "Breakpoint%d", Count);

-			sprintf(Text, "%s:%d", _breakpoints[i]->_filename, _breakpoints[i]->_lines[j]);

+			sprintf(Text, "%s:%d", _breakpoints[i]->_filename.c_str(), _breakpoints[i]->_lines[j]);

 

 			Game->_registry->WriteString("Debug", Key, Text);

 		}