aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/spot.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/spot.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/spot.h')
-rwxr-xr-xengines/pegasus/neighborhood/spot.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/pegasus/neighborhood/spot.h b/engines/pegasus/neighborhood/spot.h
index 1d5d296f9b..086f1b2a2f 100755
--- a/engines/pegasus/neighborhood/spot.h
+++ b/engines/pegasus/neighborhood/spot.h
@@ -37,7 +37,7 @@ namespace Common {
namespace Pegasus {
-typedef byte tSpotFlags;
+typedef byte SpotFlags;
enum {
kSpotLoopsBit, // Loop or once only?
@@ -46,13 +46,13 @@ enum {
kSpotOnDoorOpenBit
};
-static const tSpotFlags kNoSpotFlags = 0;
-static const tSpotFlags kSpotLoopsMask = 1 << kSpotLoopsBit;
-static const tSpotFlags kSpotOnArrivalMask = 1 << kSpotOnArrivalBit;
-static const tSpotFlags kSpotOnTurnMask = 1 << kSpotOnTurnBit;
-static const tSpotFlags kSpotOnDoorOpenMask = 1 << kSpotOnDoorOpenBit;
+static const SpotFlags kNoSpotFlags = 0;
+static const SpotFlags kSpotLoopsMask = 1 << kSpotLoopsBit;
+static const SpotFlags kSpotOnArrivalMask = 1 << kSpotOnArrivalBit;
+static const SpotFlags kSpotOnTurnMask = 1 << kSpotOnTurnBit;
+static const SpotFlags kSpotOnDoorOpenMask = 1 << kSpotOnDoorOpenBit;
-static const tSpotFlags kSpotTriggers = kSpotOnArrivalMask | kSpotOnTurnMask | kSpotOnDoorOpenMask;
+static const SpotFlags kSpotTriggers = kSpotOnArrivalMask | kSpotOnTurnMask | kSpotOnDoorOpenMask;
class SpotTable {
public:
@@ -77,16 +77,16 @@ public:
dstFlags = kNoSpotFlags;
}
- tRoomID room;
- tDirectionConstant direction;
- tSpotFlags srcFlags;
- tAlternateID altCode;
+ RoomID room;
+ DirectionConstant direction;
+ SpotFlags srcFlags;
+ AlternateID altCode;
TimeValue movieStart;
TimeValue movieEnd;
- tSpotFlags dstFlags;
+ SpotFlags dstFlags;
};
- Entry findEntry(tRoomID room, tDirectionConstant direction, tSpotFlags srcFlags, tAlternateID altCode);
+ Entry findEntry(RoomID room, DirectionConstant direction, SpotFlags srcFlags, AlternateID altCode);
private:
Common::Array<Entry> _entries;