From 8eaf094bf59a30255f6e981bd9e1c593fc17b2fb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 10 Sep 2016 23:16:15 -0400
Subject: TITANIC: Move text messages to DAT file

---
 engines/titanic/npcs/bilge_succubus.cpp | 10 +++++-----
 engines/titanic/npcs/deskbot.cpp        |  4 ++--
 engines/titanic/npcs/succubus.cpp       | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'engines/titanic/npcs')

diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp
index 16064bf212..d1b89e58b4 100644
--- a/engines/titanic/npcs/bilge_succubus.cpp
+++ b/engines/titanic/npcs/bilge_succubus.cpp
@@ -81,7 +81,7 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 
 		playSound("z#28.wav", 70);
 	} else if (!_enabled) {
-		petDisplayMessage(2, "The Succ-U-Bus is in Standby, or \"Off\" mode at present.");
+		petDisplayMessage(2, SUCCUBUS_IS_IN_STANDBY);
 		return false;
 	} else if (!pet) {
 		return false;
@@ -96,7 +96,7 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 			if (_startFrame4 >= 0)
 				playMovie(_startFrame4, _endFrame4, MOVIE_GAMESTATE);
 		} else {
-			petDisplayMessage(2, "There is currently nothing to deliver.");
+			petDisplayMessage(2, NOTHING_TO_DELIVER);
 		}
 	}
 
@@ -112,7 +112,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 	CGameObject *mailObject = findMail(petRoomFlags);
 
 	if (!mailObject) {
-		petDisplayMessage(2, "There is currently nothing in the tray to send.");
+		petDisplayMessage(2, NOTHING_IN_SUCCUBUS_TRAY);
 		return true;
 	}
 
@@ -329,7 +329,7 @@ bool CBilgeSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
 
 	uint petRoomFlags = pet->getRoomFlags();
 	if (mailExists(petRoomFlags)) {
-		petDisplayMessage(2, "The Succ-U-Bus is a Single Entity Delivery Device.");
+		petDisplayMessage(2, SUCCUBUS_SINGLE_DELIVERY);
 		item->petAddToInventory();
 		return true;
 	}
@@ -387,7 +387,7 @@ bool CBilgeSuccUBus::EnterViewMsg(CEnterViewMsg *msg) {
 }
 
 bool CBilgeSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
-	petDisplayMessage(2, "");
+	petDisplayMessage(2, BLANK);
 	petClear();
 
 	if (_soundHandle != -1) {
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index 5b6364f1cb..8f1fc28e20 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -176,12 +176,12 @@ bool CDeskbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
 
 		switch (_classNum) {
 		case 1:
-			petDisplayMessage("You have been upgraded to 1st Class status. Enjoy hugely.");
+			petDisplayMessage(UPGRADED_TO_FIRST_CLASS);
 			setPassengerClass(_classNum);
 			petReassignRoom(_classNum);
 			break;
 		case 2:
-			petDisplayMessage("You have been upgraded to 2nd Class status. Enjoy.");
+			petDisplayMessage(UPGRADED_TO_SECOND_CLASS);
 			setPassengerClass(_classNum);
 			petReassignRoom(_classNum);
 			break;
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 5588d862c3..453f016757 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -274,7 +274,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
 	if (!_enabled || !pet || !item || !tempRect.contains(item->getControid())) {
 		item->petAddToInventory();
 	} else if (mailExists(roomFlags)) {
-		petDisplayMessage("The Succ-U-Bus is a Single Entity Delivery Device.");
+		petDisplayMessage(SUCCUBUS_DESCRIPTION);
 		item->petAddToInventory();
 	} else {
 		petContainerRemove(item);
@@ -337,7 +337,7 @@ bool CSuccUBus::EnterViewMsg(CEnterViewMsg *msg) {
 }
 
 bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
-	petDisplayMessage(2, "");
+	petDisplayMessage(2, BLANK);
 	if (_startFrame8 >= 0)
 		loadFrame(_startFrame8);
 	else if (!_field15C && _startFrame9 >= 0)
@@ -370,7 +370,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 		return true;
 
 	if (!_enabled) {
-		petDisplayMessage(2, "The Succ-U-Bus is in Standby, or \"Off\" mode at present.");
+		petDisplayMessage(2, SUCCUBUS_IS_IN_STANDBY);
 		return true;
 	}
 
@@ -394,7 +394,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 			break;
 		}
 
-		petDisplayMessage(2, "There is currently nothing in the tray to send.");
+		petDisplayMessage(2, NOTHING_IN_SUCCUBUS_TRAY);
 	} else {
 		_field19C = 0;
 		
@@ -458,7 +458,7 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 	if (_field1D8 || !pet)
 		return true;
 	if (!_enabled) {
-		petDisplayMessage(2, "The Succ-U-Bus is in Standby, or \"Off\" mode at present.");
+		petDisplayMessage(2, SUCCUBUS_IS_IN_STANDBY);
 		return true;
 	}
 
@@ -489,7 +489,7 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 
 			playMovie(_startFrame6, _endFrame6, 0);
 			playMovie(_startFrame7, _endFrame7, 0);
-			petDisplayMessage(2, "There is currently nothing to deliver.");
+			petDisplayMessage(2, NOTHING_TO_DELIVER);
 		} else {
 			startTalking(this, 230004, findView());
 
-- 
cgit v1.2.3