diff options
Diffstat (limited to 'engines/titanic/moves')
-rw-r--r-- | engines/titanic/moves/call_pellerator.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/moves/enter_exit_first_class_state.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/moves/enter_sec_class_state.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/moves/exit_pellerator.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/moves/exit_tiania.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/moves/restricted_move.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/moves/trip_down_canal.cpp | 2 |
7 files changed, 11 insertions, 13 deletions
diff --git a/engines/titanic/moves/call_pellerator.cpp b/engines/titanic/moves/call_pellerator.cpp index 0dd8195277..75edd50a25 100644 --- a/engines/titanic/moves/call_pellerator.cpp +++ b/engines/titanic/moves/call_pellerator.cpp @@ -47,7 +47,7 @@ bool CCallPellerator::EnterViewMsg(CEnterViewMsg *msg) { CString name = getFullViewName(); if (name == "TopOfWell.Node 6.S") { - petDisplayMessage(2, "You are standing outside the Pellerator."); + petDisplayMessage(2, STANDING_OUTSIDE_PELLERATOR); } petSetRemoteTarget(); @@ -64,7 +64,7 @@ bool CCallPellerator::PETActivateMsg(CPETActivateMsg *msg) { if (msg->_name == "Pellerator") { if (petDoorOrBellbotPresent()) { - petDisplayMessage("I'm sorry, you cannot enter this pellerator at present as a bot is in the way."); + petDisplayMessage(BOT_BLOCKING_PELLERATOR); } else if (name == "Bar.Node 1.S") { changeView("Pellerator.Node 1.S"); } else { diff --git a/engines/titanic/moves/enter_exit_first_class_state.cpp b/engines/titanic/moves/enter_exit_first_class_state.cpp index 34e9984aa7..efdead533a 100644 --- a/engines/titanic/moves/enter_exit_first_class_state.cpp +++ b/engines/titanic/moves/enter_exit_first_class_state.cpp @@ -52,12 +52,11 @@ bool CEnterExitFirstClassState::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { break; case 2: - petDisplayMessage(1, "This room is reserved for the exclusive use of first class passengeres." - " That does not currently include you"); + petDisplayMessage(1, ROOM_RESERVED_FOR_FIRST_CLASS); break; default: - petDisplayMessage("No losers."); + petDisplayMessage(NO_LOSERS); break; } diff --git a/engines/titanic/moves/enter_sec_class_state.cpp b/engines/titanic/moves/enter_sec_class_state.cpp index 2a35621003..853a00d590 100644 --- a/engines/titanic/moves/enter_sec_class_state.cpp +++ b/engines/titanic/moves/enter_sec_class_state.cpp @@ -50,7 +50,7 @@ void CEnterSecClassState::load(SimpleFile *file) { bool CEnterSecClassState::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (getPassengerClass() > 2) { playSound("b#105.wav"); - petDisplayMessage(1, "Passengers of your class are not permitted to enter this area."); + petDisplayMessage(1, CLASS_NOT_PERMITTED_IN_AREA); } else if (!compareRoomNameTo("SecClassLittleLift") || _mode == 2) { CActMsg actMsg(getFullViewName().deleteRight(3) + ".S"); actMsg.execute("SecClassRoomLeaver"); diff --git a/engines/titanic/moves/exit_pellerator.cpp b/engines/titanic/moves/exit_pellerator.cpp index 12ca2c1e3c..3140d90b4c 100644 --- a/engines/titanic/moves/exit_pellerator.cpp +++ b/engines/titanic/moves/exit_pellerator.cpp @@ -94,7 +94,7 @@ bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { changeView(_statics->_isWinter ? "FrozenArboretum.Node 4.S" : "Arboretum.Node 4.W"); break; default: - petDisplayMessage(2, "Please exit from the other side."); + petDisplayMessage(2, EXIT_FROM_OTHER_SIDE); CPellerator::_soundHandle = queueSound("z#438.wav", CPellerator::_soundHandle); } @@ -116,7 +116,7 @@ bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (_statics->_v2 == 2) { changeView("Bar.Node 1.N"); } else { - petDisplayMessage(2, "Please exit from the other side."); + petDisplayMessage(2, EXIT_FROM_OTHER_SIDE); CPellerator::_soundHandle = queueSound("z#438.wav", CPellerator::_soundHandle); } } diff --git a/engines/titanic/moves/exit_tiania.cpp b/engines/titanic/moves/exit_tiania.cpp index fb0f149ba9..63c1cbae4e 100644 --- a/engines/titanic/moves/exit_tiania.cpp +++ b/engines/titanic/moves/exit_tiania.cpp @@ -54,8 +54,7 @@ void CExitTiania::load(SimpleFile *file) { bool CExitTiania::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (getPassengerClass() == 4) { - petDisplayMessage(1, "For mysterious and unknowable reasons, " - "this transport is temporarily out of order."); + petDisplayMessage(1, TRANSPORT_OUT_OF_ORDER); } else { lockMouse(); for (int idx = 0; idx < 3; ++idx) diff --git a/engines/titanic/moves/restricted_move.cpp b/engines/titanic/moves/restricted_move.cpp index 37cb1c46dc..b1040a3554 100644 --- a/engines/titanic/moves/restricted_move.cpp +++ b/engines/titanic/moves/restricted_move.cpp @@ -52,10 +52,10 @@ bool CRestrictedMove::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { // Okay to change to the given destination changeView(_destination); } else if (classNum != 4) { - petDisplayMessage(1, "Passengers of your class are not permitted to enter this area."); + petDisplayMessage(1, CLASS_NOT_ALLOWED_AT_DEST); } else if (compareRoomNameTo("EmbLobby")) { playSound("a#17.wav"); - petDisplayMessage(1, "Please check in at the reception desk."); + petDisplayMessage(1, CHECK_IN_AT_RECEPTION); } else if (compareViewNameTo("Titania.Node 1.S")) { playSound("z#226.wav"); changeView(_destination); diff --git a/engines/titanic/moves/trip_down_canal.cpp b/engines/titanic/moves/trip_down_canal.cpp index e9818fa96d..010505a510 100644 --- a/engines/titanic/moves/trip_down_canal.cpp +++ b/engines/titanic/moves/trip_down_canal.cpp @@ -43,7 +43,7 @@ void CTripDownCanal::load(SimpleFile *file) { bool CTripDownCanal::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (stateGetSeason() == SEASON_WINTER) { - petDisplayMessage("Sadly, the Grand Canal transport system is closed for the winter."); + petDisplayMessage(CANAL_CLOSED_FOR_WINTER); } else if (getGameManager()) { changeView(_destination); } |