TITANIC: Fix identified warnings

5 files changed, 24 insertions, 22 deletions

diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index 110218401a..f77d081c61 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -50,24 +50,24 @@ CString CLinkItem::formName() {
 	switch (_linkMode) {
 	case 1:
 		return CString::format("_PANL,%d,%s,%s", node->_nodeNumber,
-			view->getName(), destView->getName());
+			view->getName().c_str(), destView->getName().c_str());
 
 	case 2:
 		return CString::format("_PANR,%d,%s,%s", node->_nodeNumber,
-			view->getName(), destView->getName());
+			view->getName().c_str(), destView->getName().c_str());
 
 	case 3:
 		return CString::format("_TRACK,%d,%s,%d,%s", 
-			node->_nodeNumber, view->getName(), 
-			destNode->_nodeNumber, destView->getName());
+			node->_nodeNumber, view->getName().c_str(), 
+			destNode->_nodeNumber, destView->getName().c_str());
 
 	case 4:
 		return CString::format("_EXIT,%d,%d,%s,%d,%d,%s",
-			room->_roomNumber, node->_nodeNumber, view->getName(),
-			destRoom->_roomNumber, destNode->_nodeNumber, destView->getName());
+			room->_roomNumber, node->_nodeNumber, view->getName().c_str(),
+			destRoom->_roomNumber, destNode->_nodeNumber, destView->getName().c_str());
 
 	default:
-		return getName();
+		return getName().c_str();
 	}
 }
 
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index 440d74ade5..1cafe3bafa 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -39,12 +39,12 @@ int QSoundManager::loadSound(const CString &name) {
 	return 0;
 }
 
-int QSoundManager::proc4() {
+int QSoundManager::proc4() const {
 	warning("TODO");
 	return 0;
 }
 
-int QSoundManager::proc5() {
+int QSoundManager::proc5() const {
 	warning("TODO");
 	return 0;
 }
@@ -91,7 +91,7 @@ bool QSoundManager::isActive(int handle) const {
 	return false;
 }
 
-int QSoundManager::proc16() {
+int QSoundManager::proc16() const {
 	warning("TODO");
 	return 0;
 }
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h
index 942124e796..a65162d779 100644
--- a/engines/titanic/sound/sound_manager.h
+++ b/engines/titanic/sound/sound_manager.h
@@ -119,8 +119,8 @@ public:
 	 */
 	virtual int loadSound(const CString &name);
 
-	virtual int proc4();
-	virtual int proc5();
+	virtual int proc4() const;
+	virtual int proc5() const;
 	virtual void proc6();
 	virtual void proc7();
 	virtual void proc8(int v);
@@ -131,7 +131,7 @@ public:
 	virtual void proc13();
 	virtual bool proc14();
 	virtual bool isActive(int handle) const;
-	virtual int proc16();
+	virtual int proc16() const;
 	virtual void WaveMixPump();
 
 	
diff --git a/engines/titanic/support/simple_file.cpp b/engines/titanic/support/simple_file.cpp
index e60b7c7485..35b2e28e4a 100644
--- a/engines/titanic/support/simple_file.cpp
+++ b/engines/titanic/support/simple_file.cpp
@@ -36,9 +36,9 @@ CString readStringFromStream(Common::SeekableReadStream *s) {
 
 /*------------------------------------------------------------------------*/
 
-bool File::open(const Common::String &name) {
-	if (!Common::File::open(name))
-		error("Could not open file - %s", name.c_str());
+bool File::open(const Common::String &filename) {
+	if (!Common::File::open(filename))
+		error("Could not open file - %s", filename.c_str());
 	return true;
 }
 
@@ -466,8 +466,9 @@ void SimpleFile::skipSpaces() {
 
 /*------------------------------------------------------------------------*/
 
-void StdCWadFile::open(const CString &name) {
+bool StdCWadFile::open(const Common::String &filename) {
 	File f;
+	CString name = filename;
 
 	// Check for whether it is indeed a file/resource pair
 	int idx = name.indexOf('#');
@@ -478,17 +479,17 @@ void StdCWadFile::open(const CString &name) {
 		f.open(name);
 
 		SimpleFile::open(f.readStream(f.size()));
-		return;
+		return true;
 	}
 
 	// Split up the name and resource, and get the resource index
-	CString filename = name.left(idx) + ".st";
+	CString fname = name.left(idx) + ".st";
 	int extPos = name.lastIndexOf('.');
 	CString resStr = name.mid(idx + 1, extPos - idx - 1);
 	int resIndex = resStr.readInt();
 
 	// Open up the index for access 
-	f.open(filename);
+	f.open(fname);
 	int indexSize = f.readUint32LE() / 4;
 	assert(resIndex < indexSize);
 
@@ -505,6 +506,7 @@ void StdCWadFile::open(const CString &name) {
 	SimpleFile::open(stream);
 
 	f.close();
+	return true;
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/support/simple_file.h b/engines/titanic/support/simple_file.h
index 0cfb424fad..6cf9995d16 100644
--- a/engines/titanic/support/simple_file.h
+++ b/engines/titanic/support/simple_file.h
@@ -41,7 +41,7 @@ class DecompressorData;
  */
 class File : public Common::File {
 public:
-	virtual bool open(const Common::String &name);
+	virtual bool open(const Common::String &filename);
 };
 
 /**
@@ -293,7 +293,7 @@ public:
 	/**
 	 * Open up the specified file
 	 */
-	void open(const CString &name);
+	virtual bool open(const Common::String &filename);
 
 	/**
 	 * Return a reference to the read stream