diff options
author | Paul Gilbert | 2016-03-06 20:23:35 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-03-06 20:23:35 -0500 |
commit | 2395e5601ca09c001ba5cff7c67a0dd70019f789 (patch) | |
tree | 5e0cb4c4997cefb55a238169cfe865916093d3f5 | |
parent | dd5c119f322b8d6462bb5b7a3028d1536c7c3214 (diff) | |
download | scummvm-rg350-2395e5601ca09c001ba5cff7c67a0dd70019f789.tar.gz scummvm-rg350-2395e5601ca09c001ba5cff7c67a0dd70019f789.tar.bz2 scummvm-rg350-2395e5601ca09c001ba5cff7c67a0dd70019f789.zip |
TITANIC: Further gcc compilation fixes
-rw-r--r-- | engines/titanic/core/list.h | 2 | ||||
-rw-r--r-- | engines/titanic/core/movie_clip.h | 1 | ||||
-rw-r--r-- | engines/titanic/core/project_item.h | 1 | ||||
-rw-r--r-- | engines/titanic/core/saveable_object.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control_sub10.h | 1 |
5 files changed, 0 insertions, 11 deletions
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index a37bca3db2..312405dca9 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -51,8 +51,6 @@ public: template<typename T> class List : public CSaveableObject, public Common::List<T *> { public: - CLASSDEF - /** * Save the data for the class to file */ diff --git a/engines/titanic/core/movie_clip.h b/engines/titanic/core/movie_clip.h index 3db24debb6..cd6125d438 100644 --- a/engines/titanic/core/movie_clip.h +++ b/engines/titanic/core/movie_clip.h @@ -62,7 +62,6 @@ public: */ class CMovieClipList: public List<CMovieClip> { public: - CLASSDEF }; } // End of namespace Titanic diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h index f454392383..81b1869a6b 100644 --- a/engines/titanic/core/project_item.h +++ b/engines/titanic/core/project_item.h @@ -59,7 +59,6 @@ public: */ class CFileList: public List<CFileListItem> { public: - CLASSDEF }; diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 943715b8f8..e831cca8b0 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -459,14 +459,12 @@ DEFFN(CClickResponder) DEFFN(CDontSaveFileItem) DEFFN(CDropTarget) DEFFN(CFileItem) -DEFFN(CFileList) DEFFN(CFileListItem) DEFFN(CGameObject) DEFFN(CLinkItem) DEFFN(ListItem) DEFFN(CMessageTarget) DEFFN(CMovieClip) -DEFFN(CMovieClipList) DEFFN(CMultiDropTarget) DEFFN(CNamedItem) DEFFN(CNodeItem) @@ -634,7 +632,6 @@ DEFFN(CPETClass1) DEFFN(CPETClass2) DEFFN(CPETClass3) DEFFN(CPetControl) -DEFFN(CPetControlSub10) DEFFN(CPetDragChev) DEFFN(CPetGraphic) DEFFN(CPetGraphic2) @@ -1025,14 +1022,12 @@ void CSaveableObject::initClassList() { ADDFN(CDontSaveFileItem, CFileItem); ADDFN(CDropTarget, CGameObject); ADDFN(CFileItem, CTreeItem); - ADDFN(CFileList, List); ADDFN(CFileListItem, ListItem); ADDFN(CGameObject, CNamedItem); ADDFN(CLinkItem, CNamedItem); ADDFN(ListItem, CSaveableObject); ADDFN(CMessageTarget, CSaveableObject); ADDFN(CMovieClip, ListItem); - ADDFN(CMovieClipList, List); ADDFN(CMultiDropTarget, CDropTarget); ADDFN(CNamedItem, CTreeItem); ADDFN(CNodeItem, CNamedItem); @@ -1278,7 +1273,6 @@ void CSaveableObject::initClassList() { ADDFN(CMusicSwitchReverse, CMusicSwitch); ADDFN(CMusicVoiceMute, CMusicControl); ADDFN(CPetControl, CGameObject); - ADDFN(CPetControlSub10, List); ADDFN(CPetDragChev, CPetGraphic2); ADDFN(CPetGraphic, CGameObject); ADDFN(CPetGraphic2, CGameObject); diff --git a/engines/titanic/pet_control/pet_control_sub10.h b/engines/titanic/pet_control/pet_control_sub10.h index e532f9c116..f8534d7089 100644 --- a/engines/titanic/pet_control/pet_control_sub10.h +++ b/engines/titanic/pet_control/pet_control_sub10.h @@ -41,7 +41,6 @@ protected: CPetVal _val2; CPetVal _val3; public: - CLASSDEF CPetControlSub10(); virtual void proc8(); |