diff options
author | Paul Gilbert | 2016-06-04 15:32:45 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:19:25 -0400 |
commit | ebb60288716bc4876183989d04d7bb2208b9fceb (patch) | |
tree | 3a89f83c7f6d472891c1f184facd65b41f94d2db /engines/titanic | |
parent | e9c239797d2c99ec15675513c577b92a1ea6802e (diff) | |
download | scummvm-rg350-ebb60288716bc4876183989d04d7bb2208b9fceb.tar.gz scummvm-rg350-ebb60288716bc4876183989d04d7bb2208b9fceb.tar.bz2 scummvm-rg350-ebb60288716bc4876183989d04d7bb2208b9fceb.zip |
TITANIC: gcc compilation fixes
Diffstat (limited to 'engines/titanic')
-rw-r--r-- | engines/titanic/core/list.h | 2 | ||||
-rw-r--r-- | engines/titanic/game_view.h | 1 | ||||
-rw-r--r-- | engines/titanic/sound/sound_manager.h | 1 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.h | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index 1905c0ffa8..4052a018c7 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -149,7 +149,7 @@ public: } bool contains(const T *item) const { - for (Common::List<T *>::const_iterator i = Common::List<T *>::begin(); + for (typename Common::List<T *>::const_iterator i = Common::List<T *>::begin(); i != Common::List<T *>::end(); ++i) { if (*i == item) return true; diff --git a/engines/titanic/game_view.h b/engines/titanic/game_view.h index 0bba5cfa86..74ab207d36 100644 --- a/engines/titanic/game_view.h +++ b/engines/titanic/game_view.h @@ -39,6 +39,7 @@ public: CVideoSurface *_surface; public: CGameView(); + virtual ~CGameView() {} /** * Set the game manager diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h index e9fd1faf0a..75cf06e931 100644 --- a/engines/titanic/sound/sound_manager.h +++ b/engines/titanic/sound/sound_manager.h @@ -36,6 +36,7 @@ protected: int _field14; public: SoundManager(); + virtual ~SoundManager() {} /** * Loads a sound diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h index 349e9e9910..428a3e3229 100644 --- a/engines/titanic/true_talk/tt_word.h +++ b/engines/titanic/true_talk/tt_word.h @@ -70,7 +70,7 @@ public: public: TTword(const TTstring &str, WordClass wordClass, int val2); TTword(const TTword *src); - ~TTword(); + virtual ~TTword(); /** * Delete any following words chained to the word |