aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/door.h
diff options
context:
space:
mode:
authorMatthew Hoops2011-12-16 14:17:50 -0500
committerMatthew Hoops2011-12-16 14:17:50 -0500
commit12efb47b536d2f663c9cde2739a1fd40599da669 (patch)
tree9ce08d6a798ff5138ee2908642e6468d7d2b249e /engines/pegasus/neighborhood/door.h
parentfdced472abc830c07d28474727db004c8018fcac (diff)
downloadscummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.gz
scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.bz2
scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.zip
PEGASUS: Remove t prefix from typedefs
Some other minor cleanup too
Diffstat (limited to 'engines/pegasus/neighborhood/door.h')
-rwxr-xr-xengines/pegasus/neighborhood/door.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/pegasus/neighborhood/door.h b/engines/pegasus/neighborhood/door.h
index db05e22ac8..74e9ac8441 100755
--- a/engines/pegasus/neighborhood/door.h
+++ b/engines/pegasus/neighborhood/door.h
@@ -37,16 +37,16 @@ namespace Common {
namespace Pegasus {
-typedef byte tDoorFlags;
+typedef byte DoorFlags;
enum {
kDoorPresentBit, // Bit set if there is a door here.
kDoorLockedBit // Bit set if door is locked, clear if unlocked.
};
-const tDoorFlags kNoDoorFlags = 0;
-const tDoorFlags kDoorPresentMask = 1 << kDoorPresentBit;
-const tDoorFlags kDoorLockedMask = 1 << kDoorLockedBit;
+const DoorFlags kNoDoorFlags = 0;
+const DoorFlags kDoorPresentMask = 1 << kDoorPresentBit;
+const DoorFlags kDoorLockedMask = 1 << kDoorLockedBit;
class DoorTable {
public:
@@ -70,15 +70,15 @@ public:
flags = kNoDoorFlags;
}
- tRoomID room;
- tDirectionConstant direction;
- tAlternateID altCode;
+ RoomID room;
+ DirectionConstant direction;
+ AlternateID altCode;
TimeValue movieStart;
TimeValue movieEnd;
- tDoorFlags flags;
+ DoorFlags flags;
};
- Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);
+ Entry findEntry(RoomID room, DirectionConstant direction, AlternateID altCode);
private:
Common::Array<Entry> _entries;