TITANIC: gcc compilation fixes

9 files changed, 39 insertions, 29 deletions

diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 1b56d1b85f..943715b8f8 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -412,8 +412,8 @@ Common::List<ClassDef *> *CSaveableObject::_classDefs;
 
 #define DEFFN(T) ClassDef *T::_type; \
 	CSaveableObject *Function##T() { return new T(); }
-#define ADDFN(CHILD, PARENT) (*_classList)[#CHILD] = Function##CHILD; \
-	##CHILD::_type = new TypeTemplate<CHILD>(#CHILD, nullptr)
+#define ADDFN(CHILD, PARENT) CHILD::_type = new TypeTemplate<CHILD>(#CHILD, nullptr); \
+	(*_classList)[#CHILD] = Function##CHILD
 
 DEFFN(CArm)
 DEFFN(CAuditoryCentre)
@@ -459,6 +459,7 @@ DEFFN(CClickResponder)
 DEFFN(CDontSaveFileItem)
 DEFFN(CDropTarget)
 DEFFN(CFileItem)
+DEFFN(CFileList)
 DEFFN(CFileListItem)
 DEFFN(CGameObject)
 DEFFN(CLinkItem)
@@ -470,6 +471,7 @@ DEFFN(CMultiDropTarget)
 DEFFN(CNamedItem)
 DEFFN(CNodeItem)
 DEFFN(CProjectItem)
+DEFFN(CResourceKey)
 DEFFN(CSaveableObject)
 DEFFN(CStaticImage)
 DEFFN(CTurnOnObject)
@@ -555,7 +557,7 @@ DEFFN(CLongStickDispenser)
 DEFFN(CMailMan)
 DEFFN(CMissiveOMat)
 DEFFN(CMissiveOMatButton)
-DEFFN(CMovieTester);
+DEFFN(CMovieTester)
 DEFFN(CMusicalInstrument)
 DEFFN(CMusicConsoleButton)
 DEFFN(CMusicRoomPhonograph)
@@ -632,6 +634,7 @@ DEFFN(CPETClass1)
 DEFFN(CPETClass2)
 DEFFN(CPETClass3)
 DEFFN(CPetControl)
+DEFFN(CPetControlSub10)
 DEFFN(CPetDragChev)
 DEFFN(CPetGraphic)
 DEFFN(CPetGraphic2)
@@ -793,6 +796,7 @@ DEFFN(CLightsMsg)
 DEFFN(CLockPhonographMsg)
 DEFFN(CMaitreDDefeatedMsg)
 DEFFN(CMaitreDHappyMsg)
+DEFFN(CMessage)
 DEFFN(CMissiveOMatActionMsg)
 DEFFN(CMouseMsg)
 DEFFN(CMouseMoveMsg)
@@ -972,7 +976,7 @@ DEFFN(CTriggerAutoMusicPlayer)
 DEFFN(CViewAutoSoundPlayer)
 DEFFN(CViewTogglesOtherMusic)
 DEFFN(CWaterLappingSounds)
-DEFFN(CStarControl);
+DEFFN(CStarControl)
 
 void CSaveableObject::initClassList() {
 	_classDefs = new Common::List<ClassDef *>();
@@ -1021,6 +1025,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CDontSaveFileItem, CFileItem);
 	ADDFN(CDropTarget, CGameObject);
 	ADDFN(CFileItem, CTreeItem);
+	ADDFN(CFileList, List);
 	ADDFN(CFileListItem, ListItem);
 	ADDFN(CGameObject, CNamedItem);
 	ADDFN(CLinkItem, CNamedItem);
@@ -1032,6 +1037,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CNamedItem, CTreeItem);
 	ADDFN(CNodeItem, CNamedItem);
 	ADDFN(CProjectItem, CFileItem);
+	ADDFN(CResourceKey, CSaveableObject);
 	ADDFN(CSaveableObject, CSaveableObject);
 	ADDFN(CStaticImage, CGameObject);
 	ADDFN(CTurnOnObject, CBackground);
@@ -1272,6 +1278,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CMusicSwitchReverse, CMusicSwitch);
 	ADDFN(CMusicVoiceMute, CMusicControl);
 	ADDFN(CPetControl, CGameObject);
+	ADDFN(CPetControlSub10, List);
 	ADDFN(CPetDragChev, CPetGraphic2);
 	ADDFN(CPetGraphic, CGameObject);
 	ADDFN(CPetGraphic2, CGameObject);
@@ -1356,6 +1363,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CLockPhonographMsg, CMessage);
 	ADDFN(CMaitreDDefeatedMsg, CMessage);
 	ADDFN(CMaitreDHappyMsg, CMessage);
+	ADDFN(CMessage, CSaveableObject);
 	ADDFN(CMissiveOMatActionMsg, CMessage);
 	ADDFN(CMouseMsg, CMessage);
 	ADDFN(CMouseMoveMsg, CMouseMsg);
diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h
index 8368c71d3f..32b277f53b 100644
--- a/engines/titanic/core/saveable_object.h
+++ b/engines/titanic/core/saveable_object.h
@@ -39,6 +39,7 @@ public:
 public:
 	ClassDef(const char *className, ClassDef *parent) :
 		_className(className), _parent(parent) {}
+	virtual ~ClassDef() {}
 	virtual CSaveableObject *create();
 };
 
diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index c11d688985..5e6e0d7939 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -136,15 +136,15 @@ public:
 	CLASSDEF \
 	}
 
-MESSAGE1(CActMsg, CString, value, nullptr);
-MESSAGE1(CActivationmsg, CString, value, nullptr);
+MESSAGE1(CActMsg, CString, value, "");
+MESSAGE1(CActivationmsg, CString, value, "");
 MESSAGE1(CAddHeadPieceMsg, CString, value, "NULL");
 MESSAGE1(CAnimateMaitreDMsg, int, value, 0);
 MESSAGE1(CArboretumGateMsg, int, value, 0);
 MESSAGE0(CArmPickedUpFromTableMsg);
 MESSAGE0(CBodyInBilgeRoomMsg);
 MESSAGE1(CBowlStateChange, int, value, 0);
-MESSAGE2(CCarryObjectArrivedMsg, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE2(CCarryObjectArrivedMsg, CString, strValue, "", int, numValue, 0);
 MESSAGE1(CChangeSeasonMsg, CString, season, "Summer");
 MESSAGE0(CCheckAllPossibleCodes);
 MESSAGE2(CCheckChevCode, int, value1, 0, int, value2, 0);
@@ -156,7 +156,7 @@ MESSAGE0(CCorrectMusicPlayedMsg);
 MESSAGE0(CCreateMusicPlayerMsg);
 MESSAGE0(CCylinderHolderReadyMsg);
 MESSAGE0(CDeactivationMsg);
-MESSAGE1(CDeliverCCarryMsg, CString, value, nullptr);
+MESSAGE1(CDeliverCCarryMsg, CString, value, "");
 MESSAGE0(CDisableMaitreDProdReceptor);
 MESSAGE0(CDismissBotMsg);
 MESSAGE0(CDoffNavHelmet);
@@ -171,7 +171,7 @@ MESSAGE0(CErasePhonographCylinderMsg);
 MESSAGE2(CFreshenCookieMsg, int, value1, 0, int, value2, 0);
 MESSAGE1(CGetChevClassBits, int, value, 0);
 MESSAGE1(CGetChevClassNum, int, value, 0);
-MESSAGE2(CGetChevCodeFromRoomNameMsg, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE2(CGetChevCodeFromRoomNameMsg, CString, strValue, "", int, numValue, 0);
 MESSAGE1(CGetChevFloorBits, int, value, 0);
 MESSAGE1(CGetChevFloorNum, int, value, 0);
 MESSAGE1(CGetChevLiftBits, int, value, 0);
@@ -198,11 +198,11 @@ MESSAGE2(CNPCPlayAnimationMsg, int, value1, 0, int, value2, 0);
 MESSAGE1(CNPCPlayIdleAnimationMsg, int, value, 0);
 MESSAGE3(CNPCPlayTalkingAnimationMsg, int, value1, 0, int, value2, 0, int, value3, 0);
 MESSAGE0(CNPCQueueIdleAnimMsg);
-MESSAGE1(CNutPuzzleMsg, CString, value, nullptr);
+MESSAGE1(CNutPuzzleMsg, CString, value, "");
 MESSAGE1(COnSummonBotMsg, int, value, 0);
 MESSAGE0(COpeningCreditsMsg);
 MESSAGE1(CPanningAwayFromParrotMsg, int, value, 0);
-MESSAGE2(CParrotSpeakMsg, CString, value1, nullptr, CString, value2, nullptr);
+MESSAGE2(CParrotSpeakMsg, CString, value1, "", CString, value2, "");
 MESSAGE2(CParrotTriesChickenMsg, int, value1, 0, int, value2, 0);
 MESSAGE4(CPassOnDragStartMsg, int, value1, 0, int, value2, 0, int, value3, 0, int, value4, 0);
 MESSAGE1(CPhonographPlayMsg, int, value, 0);
@@ -226,8 +226,8 @@ MESSAGE1(CQueryPhonographState, int, value, 0);
 MESSAGE0(CRecordOntoCylinderMsg);
 MESSAGE0(CRemoveFromGameMsg);
 MESSAGE0(CReplaceBowlAndNutsMsg);
-MESSAGE1(CRestaurantMusicChanged, CString, value, nullptr);
-MESSAGE2(CSendCCarryMsg, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE1(CRestaurantMusicChanged, CString, value, "");
+MESSAGE2(CSendCCarryMsg, CString, strValue, "", int, numValue, 0);
 MESSAGE1(CSenseWorkingMsg, CString, value, "Not Working");
 MESSAGE2(CServiceElevatorFloorChangeMsg, int, value1, 0, int, value2, 0);
 MESSAGE0(CServiceElevatorFloorRequestMsg);
@@ -240,11 +240,11 @@ MESSAGE2(CSetChevPanelBitMsg, int, value1, 0, int, value2, 0);
 MESSAGE1(CSetChevPanelButtonsMsg, int, value, 0);
 MESSAGE1(CSetChevRoomBits, int, value, 0);
 MESSAGE0(CSetMusicControlsMsg);
-MESSAGE2(CSetVarMsg, CString, varName, nullptr, int, value, 0);
+MESSAGE2(CSetVarMsg, CString, varName, "", int, value, 0);
 MESSAGE2(CSetVolumeMsg, int, value1, 70, int, value2, 0);
-MESSAGE2(CShipSettingMsg, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE2(CShipSettingMsg, CString, strValue, "", int, numValue, 0);
 MESSAGE1(CShowTextMsg, CString, value, "NO TEXT INCLUDED!!!");
-MESSAGE2(CSignalObject, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE2(CSignalObject, CString, strValue, "", int, numValue, 0);
 MESSAGE2(CSpeechFallsFromTreeMsg, int, value1, 0, int, value2, 0);
 MESSAGE1(CStartMusicMsg, int, value, 0);
 MESSAGE3(CStatusChangeMsg, int, value1, 0, int, value2, 0, int, value3, 0);
@@ -254,10 +254,10 @@ MESSAGE0(CSubSendCCarryMsg);
 MESSAGE0(CSUBTransition);
 MESSAGE0(CSubTurnOffMsg);
 MESSAGE0(CSubTurnOnMsg);
-MESSAGE2(CSummonBotMsg, CString, strValue, nullptr, int, numValue, 0);
-MESSAGE1(CSummonBotQuerryMsg, CString, value, nullptr);
-MESSAGE1(CTakeHeadPieceMsg, CString, value, nullptr);
-MESSAGE2(CTextInputMsg, CString, value1, nullptr, CString, value2, nullptr);
+MESSAGE2(CSummonBotMsg, CString, strValue, "", int, numValue, 0);
+MESSAGE1(CSummonBotQuerryMsg, CString, value, "");
+MESSAGE1(CTakeHeadPieceMsg, CString, value, "");
+MESSAGE2(CTextInputMsg, CString, value1, "", CString, value2, "");
 MESSAGE1(CTimeDilationMsg, int, value, 0);
 MESSAGE1(CTimeMsg, int, value, 0);
 MESSAGE0(CTitleSequenceEndedMsg);
@@ -265,7 +265,7 @@ MESSAGE0(CTransitMsg);
 MESSAGE1(CTriggerAutoMusicPlayerMsg, int, value, 0);
 MESSAGE1(CTriggerNPCEvent, int, value, 0);
 MESSAGE4(CTrueTalkGetAnimSetMsg, int, value1, 0, int, value2, 0, int, value3, 0, int, value4, 0);
-MESSAGE2(CTrueTalkGetAssetDetailsMsg, CString, strValue, nullptr, int, numValue, 0);
+MESSAGE2(CTrueTalkGetAssetDetailsMsg, CString, strValue, "", int, numValue, 0);
 MESSAGE2(CTrueTalkGetStateValueMsg, int, value1, 0, int, value2, -1000);
 MESSAGE2(CTrueTalkNotifySpeechEndedMsg, int, value1, 0, int, value2, 0);
 MESSAGE3(CTrueTalkNotifySpeechStartedMsg, int, value1, 0, int, value2, 0, int, value, 0);
diff --git a/engines/titanic/messages/pet_messages.h b/engines/titanic/messages/pet_messages.h
index 195bf8a0d2..ac9c3ccc75 100644
--- a/engines/titanic/messages/pet_messages.h
+++ b/engines/titanic/messages/pet_messages.h
@@ -40,7 +40,7 @@ MESSAGE0(CPETReceiveMsg);
 MESSAGE0(CPETSetStarDestinationMsg);
 MESSAGE1(CPETStarFieldLockMsg, int, value, 0);
 MESSAGE0(CPETStereoFieldOnOffMsg);
-MESSAGE2(CPETTargetMsg, CString, strValue, nullptr, int, numValue, -1);
+MESSAGE2(CPETTargetMsg, CString, strValue, "", int, numValue, -1);
 
 } // End of namespace Titanic
 
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index f1d39ec870..b9f5b641ed 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -115,7 +115,6 @@ MODULE_OBJS := \
 	game/credits_button.o \
 	game/dead_area.o \
 	game/desk_click_responder.o \
-	game/dome_from_top_of_well.o \
 	game/doorbot_elevator_handler.o \
 	game/doorbot_home_handler.o \
 	game/ear_sweet_bowl.o \
diff --git a/engines/titanic/pet_control/pet_control_sub10.h b/engines/titanic/pet_control/pet_control_sub10.h
index f8534d7089..e532f9c116 100644
--- a/engines/titanic/pet_control/pet_control_sub10.h
+++ b/engines/titanic/pet_control/pet_control_sub10.h
@@ -41,6 +41,7 @@ protected:
 	CPetVal _val2;
 	CPetVal _val3;
 public:
+	CLASSDEF
 	CPetControlSub10();
 
 	virtual void proc8();
diff --git a/engines/titanic/star_control/star_control_sub11.h b/engines/titanic/star_control/star_control_sub11.h
index 6e47f85807..6b6807049f 100644
--- a/engines/titanic/star_control/star_control_sub11.h
+++ b/engines/titanic/star_control/star_control_sub11.h
@@ -50,12 +50,12 @@ public:
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file, int param);
+	void load(SimpleFile *file, int param);
 
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const;
+	void save(SimpleFile *file, int indent) const;
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control_sub12.h b/engines/titanic/star_control/star_control_sub12.h
index 92192ec74b..6bfc4158b4 100644
--- a/engines/titanic/star_control/star_control_sub12.h
+++ b/engines/titanic/star_control/star_control_sub12.h
@@ -44,18 +44,19 @@ private:
 	int _field21C;
 public:
 	CStarControlSub12(void *val1, void *val2);
+	virtual ~CStarControlSub12() {}
 
 	virtual void proc3() {}
 
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file, int param);
+	void load(SimpleFile *file, int param);
 
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const;
+	void save(SimpleFile *file, int indent) const;
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control_sub8.h b/engines/titanic/star_control/star_control_sub8.h
index c4b677c2ba..da95f89af9 100644
--- a/engines/titanic/star_control/star_control_sub8.h
+++ b/engines/titanic/star_control/star_control_sub8.h
@@ -46,12 +46,12 @@ public:
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file) {}
+	void load(SimpleFile *file) {}
 
 	/**
 	 * Save the data for the class to file
 	 */
-	virtual void save(SimpleFile *file, int indent) const {}
+	void save(SimpleFile *file, int indent) const {}
 };
 
 } // End of namespace Titanic