aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/room.cpp
diff options
context:
space:
mode:
authorMatthew Stewart2018-07-23 22:53:10 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commitfe98dbb69d1f8222eeb391111f59670658b0daad (patch)
treefdd8c33cb65529082f698e08e9d1a86d7cdc05e8 /engines/startrek/room.cpp
parentaa68655742c94026c701dafc1ef6efb032774434 (diff)
downloadscummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.tar.gz
scummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.tar.bz2
scummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.zip
STARTREK: Reformat with artistic style
Diffstat (limited to 'engines/startrek/room.cpp')
-rw-r--r--engines/startrek/room.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index fae52503af..daf8e09512 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -30,18 +30,18 @@
// TODO: Delete this macro, replacing it with the next one.
// New "[roomName]NumActions" variables need to be made before that.
#define ADD_ROOM_OLD(ROOM) {\
- if (name.equalsIgnoreCase(#ROOM)) {\
- _roomActionList = ROOM##ActionList;\
- _numRoomActions = sizeof(ROOM##ActionList) / sizeof(RoomAction);\
- }\
-}
+ if (name.equalsIgnoreCase(#ROOM)) {\
+ _roomActionList = ROOM##ActionList;\
+ _numRoomActions = sizeof(ROOM##ActionList) / sizeof(RoomAction);\
+ }\
+ }
#define ADD_ROOM(ROOM) {\
- if (name.equalsIgnoreCase(#ROOM)) {\
- _roomActionList = ROOM##ActionList;\
- _numRoomActions = ROOM##NumActions;\
- }\
-}
+ if (name.equalsIgnoreCase(#ROOM)) {\
+ _roomActionList = ROOM##ActionList;\
+ _numRoomActions = ROOM##NumActions;\
+ }\
+ }
namespace StarTrek {
@@ -277,8 +277,7 @@ int Room::showRoomSpecificText(const char **array) {
textColor = TEXTCOLOR_RED;
else
textColor = TEXTCOLOR_GREY;
- }
- else
+ } else
textColor = TEXTCOLOR_YELLOW;
return _vm->showText(&StarTrekEngine::readTextFromArrayWithChoices, (uintptr)array, 20, 20, textColor, true, false, false);