diff options
| author | Paul Gilbert | 2016-07-23 12:11:09 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-23 12:11:09 -0400 |
| commit | c918602800772556ae95ba477141b80316aa07ae (patch) | |
| tree | 57a51fb1417fd816158461a587096f62b4ee6b83 /engines | |
| parent | 8a6a5cebfbb6c18fe136e2925dd086912a0b7e6c (diff) | |
| download | scummvm-rg350-c918602800772556ae95ba477141b80316aa07ae.tar.gz scummvm-rg350-c918602800772556ae95ba477141b80316aa07ae.tar.bz2 scummvm-rg350-c918602800772556ae95ba477141b80316aa07ae.zip | |
TITANIC: Fix some warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/core/tree_item.h | 4 | ||||
| -rw-r--r-- | engines/titanic/detection.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_field.cpp | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h index 46d7996f0f..3754bd413e 100644 --- a/engines/titanic/core/tree_item.h +++ b/engines/titanic/core/tree_item.h @@ -127,9 +127,7 @@ public: /** * Compares the name of the item to a passed name */ - virtual int compareTo(const CString &name, int maxLen) const { return false; } - - virtual int proc23() const { return 0; } + virtual int compareTo(const CString &name, int maxLen = 0) const { return false; } /** * Returns the clip list, if any, associated with the item diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp index a9878d9da7..86d26f2f27 100644 --- a/engines/titanic/detection.cpp +++ b/engines/titanic/detection.cpp @@ -125,10 +125,10 @@ SaveStateList TitanicMetaEngine::listSaves(const char *target) const { Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file); if (in) { - Titanic::CompressedFile file; - file.open(in); + Titanic::CompressedFile cf; + cf.open(in); - if (Titanic::CProjectItem::readSavegameHeader(&file, header)) + if (Titanic::CProjectItem::readSavegameHeader(&cf, header)) saveList.push_back(SaveStateDescriptor(slot, header._saveName)); if (header._thumbnail) { @@ -136,7 +136,7 @@ SaveStateList TitanicMetaEngine::listSaves(const char *target) const { delete header._thumbnail; } - file.close(); + cf.close(); } } } diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp index a90d2280a1..882e3c3600 100644 --- a/engines/titanic/star_control/star_field.cpp +++ b/engines/titanic/star_control/star_field.cpp @@ -110,7 +110,7 @@ void CStarField::toggle4() { bool CStarField::set4(bool val) { bool oldVal = _val4; _val4 = val; - return val; + return oldVal; } int CStarField::get88() const { |