From dd5c119f322b8d6462bb5b7a3028d1536c7c3214 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 6 Mar 2016 19:57:01 -0500
Subject: TITANIC: gcc compilation fixes

---
 engines/titanic/messages/messages.h     | 34 ++++++++++++++++-----------------
 engines/titanic/messages/pet_messages.h |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'engines/titanic/messages')

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
 
-- 
cgit v1.2.3