[Scummvm-git-logs] scummvm master -> 2d7e9f4eac286aabe2e5be86a9cd1aeb14ffcf37
dreammaster
dreammaster at scummvm.org
Wed Dec 21 14:00:54 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2d7e9f4eac TITANIC: Show status prefixes for chevrons in the Rooms tab
Commit: 2d7e9f4eac286aabe2e5be86a9cd1aeb14ffcf37
https://github.com/scummvm/scummvm/commit/2d7e9f4eac286aabe2e5be86a9cd1aeb14ffcf37
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-21T08:00:51-05:00
Commit Message:
TITANIC: Show status prefixes for chevrons in the Rooms tab
Changed paths:
engines/titanic/pet_control/pet_rooms_glyphs.cpp
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
index e911759..1df4a0e 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
@@ -145,15 +145,15 @@ void CPetRoomsGlyph::getTooltip(CPetText *text) {
CRoomFlags roomFlags(_roomFlags);
CPetRooms *owner = static_cast<CPetRooms *>(getPetSection());
- CString msg;
+ CString prefix;
if (isCurrentlyAssigned()) {
- msg = "Your assigned room: ";
+ prefix = "Your assigned room: ";
} else if (isPreviouslyAssigned()) {
- msg = "A previously assigned room: ";
+ prefix = "A previously assigned room: ";
} else if (!_mailFlag) {
- msg = "Saved Chevron: ";
+ prefix = "Saved Chevron: ";
} else if (_mailFlag == 1 && owner->getRoomFlags() == _roomFlags) {
- msg = "Current location: ";
+ prefix = "Current location: ";
}
// Get the room description
@@ -165,7 +165,7 @@ void CPetRoomsGlyph::getTooltip(CPetText *text) {
}
roomStr += " (shift-click edits)";
- text->setText(roomStr);
+ text->setText(prefix + roomStr);
}
void CPetRoomsGlyph::saveGlyph(SimpleFile *file, int indent) {
More information about the Scummvm-git-logs
mailing list