aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-09 07:44:10 -0500
committerPaul Gilbert2016-11-09 07:44:10 -0500
commit93b974cc66bd9e334d426561ed08b9aa1aa36758 (patch)
treee63b7582a89c3169c64a5bb345ce3c0a0002287d /engines/titanic
parent3190d59f0bdb228616785722a3903047aed41c85 (diff)
downloadscummvm-rg350-93b974cc66bd9e334d426561ed08b9aa1aa36758.tar.gz
scummvm-rg350-93b974cc66bd9e334d426561ed08b9aa1aa36758.tar.bz2
scummvm-rg350-93b974cc66bd9e334d426561ed08b9aa1aa36758.zip
TITANIC: Give correct room descriptions in PET Rooms tab
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/room_flags.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
index 07303d8bfa..66519aa091 100644
--- a/engines/titanic/room_flags.cpp
+++ b/engines/titanic/room_flags.cpp
@@ -153,36 +153,6 @@ CString CRoomFlags::getRoomDesc() const {
}
case 4:
- if (isTransportRoom()) {
- switch (_data) {
- case 0x68797:
- return "The Service Elevator";
- case 0x5D3AD:
- return "The Super Galactic Leisure Lounge";
- case 0x96E45:
- return "The Elevator";
- case 0xAD171:
- return "The Dome";
- case 0xC95E9:
- return "The Pellerator";
- case 0xDF4D1:
- return "The Top of the Well";
- default:
- break;
- }
- }
-
- if (getRoomCategory() == 0) {
- return "Nowhere you're likely to want to go.";
- } else {
- CString result = getPassengerClassDesc();
- result += ", ";
- result += getFloorDesc();
- return result;
- }
- break;
-
- case 5:
switch (_data) {
case 0x1D0D9:
return "The Parrot Lobby";
@@ -215,6 +185,36 @@ CString CRoomFlags::getRoomDesc() const {
}
return "Unknown Room";
+ case 5:
+ if (isTransportRoom()) {
+ switch (_data) {
+ case 0x68797:
+ return "The Service Elevator";
+ case 0x5D3AD:
+ return "The Super Galactic Leisure Lounge";
+ case 0x96E45:
+ return "The Elevator";
+ case 0xAD171:
+ return "The Dome";
+ case 0xC95E9:
+ return "The Pellerator";
+ case 0xDF4D1:
+ return "The Top of the Well";
+ default:
+ break;
+ }
+ }
+
+ if (getRoomCategory() == 0) {
+ return "Nowhere you're likely to want to go.";
+ } else {
+ CString result = getPassengerClassDesc();
+ result += ", ";
+ result += getFloorDesc();
+ return result;
+ }
+ break;
+
default:
break;
}