aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/norad/subcontrolroom.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/norad/subcontrolroom.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/norad/subcontrolroom.h')
-rwxr-xr-xengines/pegasus/neighborhood/norad/subcontrolroom.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.h b/engines/pegasus/neighborhood/norad/subcontrolroom.h
index deea5042d0..e7ee84929a 100755
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.h
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.h
@@ -60,12 +60,12 @@ protected:
virtual void activateHotspots();
virtual void clickInHotspot(const Input &, const Hotspot *);
- virtual void receiveNotification(Notification *, const tNotificationFlags);
+ virtual void receiveNotification(Notification *, const NotificationFlags);
void robotKillsPlayer(const uint32, Neighborhood *);
- tInputBits getInputFilter();
+ InputBits getInputFilter();
- int findActionIndex(tHotSpotID);
+ int findActionIndex(HotSpotID);
void dispatchClawAction(const int);
void performActionImmediately(const int, const uint32, Neighborhood *);
@@ -80,12 +80,12 @@ protected:
void moveGreenBallToD();
void setControlMonitorToTime(const TimeValue, const int, const bool);
- void playControlMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags,
+ void playControlMonitorSection(const TimeValue, const TimeValue, const NotificationFlags,
const int, const bool);
void updateClawMonitor();
void setClawMonitorToTime(const TimeValue);
- void playClawMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags,
+ void playClawMonitorSection(const TimeValue, const TimeValue, const NotificationFlags,
const int, const bool);
Movie _subControlMovie;
@@ -117,10 +117,10 @@ protected:
Notification _greenBallNotification;
NotificationCallBack _greenBallCallBack;
- tHotSpotID _outSpotID;
- tHotSpotID _prepSpotID;
- tHotSpotID _clawControlSpotID;
- tHotSpotID _clawButtonSpotIDs[kNumClawButtons];
+ HotSpotID _outSpotID;
+ HotSpotID _prepSpotID;
+ HotSpotID _clawControlSpotID;
+ HotSpotID _clawButtonSpotIDs[kNumClawButtons];
Notification *_neighborhoodNotification;