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/game/chicken_dispensor.cpp | 6 +++--- engines/titanic/game/fan_control.cpp | 2 +- engines/titanic/game/hammer_dispensor_button.cpp | 2 +- engines/titanic/game/lemon_dispensor.cpp | 2 +- engines/titanic/game/light.cpp | 8 ++++---- engines/titanic/game/long_stick_dispenser.cpp | 7 +++---- engines/titanic/game/nav_helmet.cpp | 2 +- engines/titanic/game/parrot/parrot_perch_holder.cpp | 2 +- engines/titanic/game/pet/pet_lift.cpp | 4 ++-- engines/titanic/game/phonograph_lid.cpp | 2 +- engines/titanic/game/pickup/pick_up_speech_centre.cpp | 2 +- engines/titanic/game/sauce_dispensor.cpp | 8 ++++---- engines/titanic/game/seasonal_adjustment.cpp | 2 +- engines/titanic/game/sgt/sgt_nav.cpp | 6 ++---- engines/titanic/game/sgt/sgt_state_room.cpp | 2 +- engines/titanic/game/speech_dispensor.cpp | 8 ++++---- engines/titanic/game/sweet_bowl.cpp | 2 +- engines/titanic/game/third_class_canal.cpp | 2 +- engines/titanic/game/transport/lift_indicator.cpp | 9 +++------ engines/titanic/game/transport/pellerator.cpp | 4 ++-- engines/titanic/game/wheel_hotspot.cpp | 2 +- 21 files changed, 39 insertions(+), 45 deletions(-) (limited to 'engines/titanic/game') diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp index 7fb8fefcda..17d1e6a515 100644 --- a/engines/titanic/game/chicken_dispensor.cpp +++ b/engines/titanic/game/chicken_dispensor.cpp @@ -65,14 +65,14 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { for (obj = pet->getFirstObject(); obj; obj = pet->getNextObject(obj)) { if (obj->isEquals("Chicken")) { - petDisplayMessage(1, "Chickens are allocated on a one-per-customer basis."); + petDisplayMessage(1, ONE_CHICKEN_PER_CUSTOMER); return true; } } for (obj = getMailManFirstObject(); obj; obj = getNextMail(obj)) { if (obj->isEquals("Chicken")) { - petDisplayMessage(1, "Chickens are allocated on a one-per-customer basis."); + petDisplayMessage(1, ONE_ALLOCATED_CHICKEN_PER_CUSTOMER); return true; } } @@ -82,7 +82,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { switch (v1) { case 0: - petDisplayMessage(1, "Only one piece of chicken per passenger. Thank you."); + petDisplayMessage(1, ONE_CHICKEN_PER_CUSTOMER); break; case 1: setVisible(true); diff --git a/engines/titanic/game/fan_control.cpp b/engines/titanic/game/fan_control.cpp index 56a1e49dec..ad3efc92fb 100644 --- a/engines/titanic/game/fan_control.cpp +++ b/engines/titanic/game/fan_control.cpp @@ -137,7 +137,7 @@ bool CFanControl::StatusChangeMsg(CStatusChangeMsg *msg) { statusMsg._newStatus = _state; statusMsg.execute("RightFan"); } else { - petDisplayMessage(1, "Unfortunately this fan controller has blown a fuse."); + petDisplayMessage(1, FAN_HAS_BLOWN_A_FUSE); } } diff --git a/engines/titanic/game/hammer_dispensor_button.cpp b/engines/titanic/game/hammer_dispensor_button.cpp index fbda501a24..89d37a0476 100644 --- a/engines/titanic/game/hammer_dispensor_button.cpp +++ b/engines/titanic/game/hammer_dispensor_button.cpp @@ -69,7 +69,7 @@ bool CHammerDispensorButton::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) { bool CHammerDispensorButton::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { playSound("z#93.wav"); - petDisplayMessage(1, "In case of emergency hammer requirement, poke with long stick."); + petDisplayMessage(1, POKE_WITH_LONG_STICK); return true; } diff --git a/engines/titanic/game/lemon_dispensor.cpp b/engines/titanic/game/lemon_dispensor.cpp index 31a04cbeca..f84a494c26 100644 --- a/engines/titanic/game/lemon_dispensor.cpp +++ b/engines/titanic/game/lemon_dispensor.cpp @@ -80,7 +80,7 @@ bool CLemonDispensor::FrameMsg(CFrameMsg *msg) { CGameObject *obj = getDraggingObject(); if (obj && getView() == findView()) { if (obj->isEquals("Perch")) { - petDisplayMessage(1, "This stick is too short to reach the branches."); + petDisplayMessage(1, TOO_SHORT_TO_REACH_BRANCHES); return true; } diff --git a/engines/titanic/game/light.cpp b/engines/titanic/game/light.cpp index 65e357047e..bc8782a2b1 100644 --- a/engines/titanic/game/light.cpp +++ b/engines/titanic/game/light.cpp @@ -101,10 +101,10 @@ bool CLight::StatusChangeMsg(CStatusChangeMsg *msg) { bool flag = pet ? pet->isRoom59706() : false; if (_fieldFC == 1 && flag) { - petDisplayMessage(1, "That light appears to be loose."); + petDisplayMessage(1, LIGHT_IS_LOOSE); playSound("z#144.wav", 70); } else { - petDisplayMessage(1, "Lumi-Glow(tm) Lights. They glow in the dark!"); + petDisplayMessage(1, LUMI_GLOW_LIGHTS); playSound("z#62.wav", 70); } @@ -116,10 +116,10 @@ bool CLight::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool flag = pet ? pet->isRoom59706() : false; if (_fieldFC == 1 && flag) { - petDisplayMessage(1, "That light appears to be loose."); + petDisplayMessage(1, LIGHT_IS_LOOSE); playSound("z#144.wav", 70); } else { - petDisplayMessage(1, "Lumi-Glow(tm) Lights. They glow in the dark!"); + petDisplayMessage(1, LUMI_GLOW_LIGHTS); playSound("z#62.wav", 70); } diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp index 08a29f2e4b..04014e8adf 100644 --- a/engines/titanic/game/long_stick_dispenser.cpp +++ b/engines/titanic/game/long_stick_dispenser.cpp @@ -62,7 +62,7 @@ bool CLongStickDispenser::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) { loadFrame(19); } else if (_fieldC0) { playSound("z#63.wav"); - petDisplayMessage(1, "'This glass is totally and utterly unbreakable."); + petDisplayMessage(1, GLASS_IS_UNBREAKABLE); } return true; @@ -92,11 +92,10 @@ bool CLongStickDispenser::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { switch (_fieldBC) { case 0: - petDisplayMessage(1, "For emergency long stick, smash glass."); + petDisplayMessage(1, FOR_STICK_BREAK_GLASS); break; case 1: - petDisplayMessage(1, "This dispenser has suddenly been fitted with unbreakable glass " - "to prevent unseemly hoarding of sticks."); + petDisplayMessage(1, DISPENSOR_HAS_UNBREAKABLE_GLASS); break; default: break; diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp index 08ff073c26..96411ad6b7 100644 --- a/engines/titanic/game/nav_helmet.cpp +++ b/engines/titanic/game/nav_helmet.cpp @@ -54,7 +54,7 @@ bool CNavHelmet::MovieEndMsg(CMovieEndMsg *msg) { CPetControl *pet = getPetControl(); if (pet) { pet->setArea(PET_STARFIELD); - petDisplayMessage(1, "Now would be an excellent opportunity to adjust your viewing apparatus."); + petDisplayMessage(1, ADJUST_VIEWING_APPARATUS); pet->incAreaLocks(); } diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp index d594446219..b1a7dabfbf 100644 --- a/engines/titanic/game/parrot/parrot_perch_holder.cpp +++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp @@ -47,7 +47,7 @@ void CParrotPerchHolder::load(SimpleFile *file) { bool CParrotPerchHolder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (CParrot::_v1) { if (CCage::_open) { - petDisplayMessage("You cannot take this because the cage is locked shut."); + petDisplayMessage(CANNOT_TAKE_CAGE_LOCKED); } else if (!CParrot::_v4) { CTrueTalkTriggerActionMsg triggerMsg(280252, 0, 0); triggerMsg.execute(getRoot(), CParrot::_type, diff --git a/engines/titanic/game/pet/pet_lift.cpp b/engines/titanic/game/pet/pet_lift.cpp index afa9dd04cd..a7b48853e6 100644 --- a/engines/titanic/game/pet/pet_lift.cpp +++ b/engines/titanic/game/pet/pet_lift.cpp @@ -52,7 +52,7 @@ bool CPETLift::TransportMsg(CTransportMsg *msg) { } else if (msg->_roomName == "PlayersRoom" && pet) { int assignedFloor = pet->getAssignedFloorNum(); if (assignedFloor < 1 || assignedFloor > 39) { - pet->petDisplayMessage("You have not assigned a room to go to."); + pet->petDisplayMessage(NO_ROOM_ASSIGNED); floorNum = -1; } } @@ -61,7 +61,7 @@ bool CPETLift::TransportMsg(CTransportMsg *msg) { int elevatorNum = pet ? pet->getRoomsElevatorNum() : 0; if ((elevatorNum == 2 || elevatorNum == 4) && floorNum > 27) { - petDisplayMessage("Sorry, this elevator does not go below floor 27."); + petDisplayMessage(ELEVATOR_NOT_BELOW_27); } else { CTrueTalkTriggerActionMsg triggerMsg(2, floorNum, 0); triggerMsg.execute("Liftbot"); diff --git a/engines/titanic/game/phonograph_lid.cpp b/engines/titanic/game/phonograph_lid.cpp index 3741749fbf..d1ab478f3d 100644 --- a/engines/titanic/game/phonograph_lid.cpp +++ b/engines/titanic/game/phonograph_lid.cpp @@ -58,7 +58,7 @@ bool CPhonographLid::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { _open = !_open; } else { - petDisplayMessage(0, "This is the restaurant music system. It appears to be locked."); + petDisplayMessage(0, LOCKED_MUSIC_SYSTEM); } return true; diff --git a/engines/titanic/game/pickup/pick_up_speech_centre.cpp b/engines/titanic/game/pickup/pick_up_speech_centre.cpp index 5e99c0a3b7..941d5cdb28 100644 --- a/engines/titanic/game/pickup/pick_up_speech_centre.cpp +++ b/engines/titanic/game/pickup/pick_up_speech_centre.cpp @@ -63,7 +63,7 @@ bool CPickUpSpeechCentre::MouseDragStartMsg(CMouseDragStartMsg *msg) { CActMsg actMsg("PlayerGetsSpeechCentre"); actMsg.execute("SeasonalAdjust"); } else { - petDisplayMessage("You can't pick this up on account of it being stuck to the branch."); + petDisplayMessage(STUCK_TO_BRANCH); } } diff --git a/engines/titanic/game/sauce_dispensor.cpp b/engines/titanic/game/sauce_dispensor.cpp index fda7082ba6..410d4a3153 100644 --- a/engines/titanic/game/sauce_dispensor.cpp +++ b/engines/titanic/game/sauce_dispensor.cpp @@ -75,7 +75,7 @@ bool CSauceDispensor::Use(CUse *msg) { playSound("b#15.wav", 50); if (chicken->_string6 != "None") { - petDisplayMessage(1, "This foodstuff is already sufficiently garnished."); + petDisplayMessage(1, FOODSTUFF_ALREADY_GARNISHED); msg->execute("Chicken"); } else { setVisible(true); @@ -96,7 +96,7 @@ bool CSauceDispensor::Use(CUse *msg) { endMsg.execute(this); playSound("z#120.wav"); - petDisplayMessage(1, "Sadly, this dispenser is currently empty."); + petDisplayMessage(1, DISPENSOR_IS_EMPTY); } else if (msg->_item->isEquals("BeerGlass")) { CGlass *glass = dynamic_cast(msg->_item); _field108 = true; @@ -157,12 +157,12 @@ bool CSauceDispensor::LeaveViewMsg(CLeaveViewMsg *msg) { } bool CSauceDispensor::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - petDisplayMessage(1, "Please place food source beneath dispenser for sauce delivery."); + petDisplayMessage(1, PUT_FOOD_UNDER_DISPENSOR); return true; } bool CSauceDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { - petDisplayMessage(1, "Please place food source beneath dispenser for sauce delivery."); + petDisplayMessage(1, PUT_FOOD_UNDER_DISPENSOR); return true; } diff --git a/engines/titanic/game/seasonal_adjustment.cpp b/engines/titanic/game/seasonal_adjustment.cpp index 1f1cb88afb..d9eb0d6fdf 100644 --- a/engines/titanic/game/seasonal_adjustment.cpp +++ b/engines/titanic/game/seasonal_adjustment.cpp @@ -81,7 +81,7 @@ bool CSeasonalAdjustment::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool CSeasonalAdjustment::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { playSound("z#42.wav"); if (!_fieldE4) { - petDisplayMessage(1, "The Seasonal Adjustment switch is not operational at the present time."); + petDisplayMessage(1, SEASONAL_SWITCH_NOT_WORKING); } else if (!_fieldE0) { playMovie(0, 6, MOVIE_NOTIFY_OBJECT); playMovie(6, 18, 0); diff --git a/engines/titanic/game/sgt/sgt_nav.cpp b/engines/titanic/game/sgt/sgt_nav.cpp index c004f947d2..6e3c88e509 100644 --- a/engines/titanic/game/sgt/sgt_nav.cpp +++ b/engines/titanic/game/sgt/sgt_nav.cpp @@ -59,11 +59,9 @@ bool SGTNav::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { changeView("SGTState.Node 2.E"); } else if (_statics->_v1 == "Open") { - petDisplayMessage(1, "This is your stateroom. It is for sleeping. If you desire " - "entertainment or relaxation, please visit your local leisure lounge."); + petDisplayMessage(1, YOUR_STATEROOM); } else if (_statics->_v6 == "Closed") { - petDisplayMessage(1, "The bed will not currently support your weight." - " We are working on this problem but are unlikely to be able to fix it."); + petDisplayMessage(1, BED_NOT_SUPPORT_YOUR_WEIGHT); } return true; diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp index c089e401b8..02f1723d72 100644 --- a/engines/titanic/game/sgt/sgt_state_room.cpp +++ b/engines/titanic/game/sgt/sgt_state_room.cpp @@ -105,7 +105,7 @@ bool CSGTStateRoom::ActMsg(CActMsg *msg) { uint assignedRoom = pet->getAssignedRoomFlags(); if (roomFlags != assignedRoom) { - petDisplayMessage("This is not your assigned room. Please do not enjoy."); + petDisplayMessage(NOT_YOUR_ASSIGNED_ROOM); } else if (_fieldE0) { CTurnOn onMsg; onMsg.execute(this); diff --git a/engines/titanic/game/speech_dispensor.cpp b/engines/titanic/game/speech_dispensor.cpp index 20ff3c69e0..3554c48602 100644 --- a/engines/titanic/game/speech_dispensor.cpp +++ b/engines/titanic/game/speech_dispensor.cpp @@ -68,7 +68,7 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { CGameObject *dragObject = getDraggingObject(); if (!_dragItem && dragObject && getView() == findView()) { if (dragObject->isEquals("Perch")) { - petDisplayMessage(1, "This stick is too short to reach the branches."); + petDisplayMessage(1, TOO_SHORT_TO_REACH_BRANCHES); return true; } @@ -86,7 +86,7 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { case 0: playSound("z#93.wav"); if (_seasonNum == SEASON_WINTER) { - petDisplayMessage(1, "You cannot get this, it is frozen to the branch."); + petDisplayMessage(1, FROZEN_TO_BRANCH); _fieldE0 = false; _state = 1; } else { @@ -121,9 +121,9 @@ bool CSpeechDispensor::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { if (!_fieldEC) { playSound("z#93.wav"); if (_fieldF8) { - petDisplayMessage(1, "Sadly, this is out of your reach."); + petDisplayMessage(1, OUT_OF_REACH); } else { - petDisplayMessage(1, "You can't pick this up on account of it being stuck to the branch."); + petDisplayMessage(1, STUCK_TO_BRANCH); } } diff --git a/engines/titanic/game/sweet_bowl.cpp b/engines/titanic/game/sweet_bowl.cpp index d0a2525bc4..29d8044a85 100644 --- a/engines/titanic/game/sweet_bowl.cpp +++ b/engines/titanic/game/sweet_bowl.cpp @@ -60,7 +60,7 @@ bool CSweetBowl::ActMsg(CActMsg *msg) { } petDisplayMessage(isEquals("BowlNutsRustler") ? - "A bowl of pistachio nuts." : "Not a bowl of pistachio nuts."); + BOWL_OF_NUTS : NOT_A_BOWL_OF_NUTS); return true; } diff --git a/engines/titanic/game/third_class_canal.cpp b/engines/titanic/game/third_class_canal.cpp index 97b559e35d..5bc2ede63c 100644 --- a/engines/titanic/game/third_class_canal.cpp +++ b/engines/titanic/game/third_class_canal.cpp @@ -39,7 +39,7 @@ void CThirdClassCanal::load(SimpleFile *file) { } bool CThirdClassCanal::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - petDisplayMessage("This area is off limits to passengers."); + petDisplayMessage(AREA_OFF_LIMIT_TO_PASSENGERS); return true; } diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp index 7471affc36..10d62a0775 100644 --- a/engines/titanic/game/transport/lift_indicator.cpp +++ b/engines/titanic/game/transport/lift_indicator.cpp @@ -74,9 +74,7 @@ bool CLiftindicator::EnterViewMsg(CEnterViewMsg *msg) { petSetRemoteTarget(); petSetArea(PET_REMOTE); - CString str = CString::format("You are standing outside Elevator %d", - petGetRoomsWellEntry()); - petDisplayMessage(-1, str); + petDisplayMessage(OUTSIDE_ELEVATOR_NUM, petGetRoomsWellEntry()); debugC(kDebugScripts, "Claiming PET - %d, Multiplier = %f", _liftNum, multiplier); @@ -149,14 +147,13 @@ bool CLiftindicator::PETActivateMsg(CPETActivateMsg *msg) { if (msg->_name == "Lift") { if (petDoorOrBellbotPresent()) { - petDisplayMessage(1, "I'm sorry, you cannot enter this elevator at present " - "as a bot is in the way."); + petDisplayMessage(1, BOT_BLOCKING_ELEVATOR); } else { _endFrame = pet->getRoomsFloorNum(); if (petGetRoomsWellEntry() == 4 && !CLift::_v6 && pet->getRoomsFloorNum() != CLift::_elevator4Floor) { - petDisplayMessage(1, "This elevator is currently in an advanced state of non-functionality."); + petDisplayMessage(1, ELEVATOR_NON_FUNCTIONAL); } else { _start = _indicatorPos.y + (int)(_startFrame * multiplier); _end = _indicatorPos.y + (int)(_endFrame * multiplier); diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp index e4af40c334..23c61ad0ba 100644 --- a/engines/titanic/game/transport/pellerator.cpp +++ b/engines/titanic/game/transport/pellerator.cpp @@ -67,9 +67,9 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { int newDest = msg->_newStatus; if (msg->_newStatus == _destination) { - petDisplayMessage(1, "You are already at your chosen destination."); + petDisplayMessage(1, ALREADY_AT_DESTINATION); } else if (classNum == 3 || (msg->_newStatus > 4 && classNum != 1)) { - petDisplayMessage(1, "Passengers of your class are not permitted to enter this area."); + petDisplayMessage(1, CLASS_NOT_ALLOWED_AT_DEST); } else if (newDest > _destination) { CString name = getName(); changeView(name == "PelleratorObject2" ? diff --git a/engines/titanic/game/wheel_hotspot.cpp b/engines/titanic/game/wheel_hotspot.cpp index 544e6f5470..aeca7130b5 100644 --- a/engines/titanic/game/wheel_hotspot.cpp +++ b/engines/titanic/game/wheel_hotspot.cpp @@ -69,7 +69,7 @@ bool CWheelHotSpot::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { break; } } else if (_fieldE4 == 3) { - petDisplayMessage("Go where?"); + petDisplayMessage(GO_WHERE); } return true; -- cgit v1.2.3