diff options
author | Matthew Hoops | 2011-12-16 14:17:50 -0500 |
---|---|---|
committer | Matthew Hoops | 2011-12-16 14:17:50 -0500 |
commit | 12efb47b536d2f663c9cde2739a1fd40599da669 (patch) | |
tree | 9ce08d6a798ff5138ee2908642e6468d7d2b249e /engines/pegasus/neighborhood/mars/mars.h | |
parent | fdced472abc830c07d28474727db004c8018fcac (diff) | |
download | scummvm-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/mars/mars.h')
-rwxr-xr-x | engines/pegasus/neighborhood/mars/mars.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h index 01474ab831..9aca10a703 100755 --- a/engines/pegasus/neighborhood/mars/mars.h +++ b/engines/pegasus/neighborhood/mars/mars.h @@ -77,12 +77,12 @@ public: virtual uint16 getDateResID() const; - virtual tAirQuality getAirQuality(const tRoomID); + virtual AirQuality getAirQuality(const RoomID); void checkAirMask(); - void showBigExplosion(const Common::Rect &, const tDisplayOrder); - void showLittleExplosion(const Common::Rect &, const tDisplayOrder); + void showBigExplosion(const Common::Rect &, const DisplayOrder); + void showLittleExplosion(const Common::Rect &, const DisplayOrder); void hitByJunk(); void decreaseRobotShuttleEnergy(const int, Common::Point impactPoint); void setUpNextDropTime(); @@ -95,7 +95,7 @@ public: virtual void shieldOn(); virtual void shieldOff(); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); void setSoundFXLevel(const uint16); @@ -123,25 +123,25 @@ protected: void init(); void start(); void setUpAIRules(); - void arriveAt(const tRoomID, const tDirectionConstant); + void arriveAt(const RoomID, const DirectionConstant); void takeItemFromRoom(Item *); void dropItemIntoRoom(Item *, Hotspot *); void activateHotspots(); void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *); void clickInHotspot(const Input &, const Hotspot *); - tInputBits getInputFilter(); + InputBits getInputFilter(); - TimeValue getViewTime(const tRoomID, const tDirectionConstant); - void getZoomEntry(const tHotSpotID, ZoomTable::Entry &); - void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); - tCanOpenDoorReason canOpenDoor(DoorTable::Entry &); + TimeValue getViewTime(const RoomID, const DirectionConstant); + void getZoomEntry(const HotSpotID, ZoomTable::Entry &); + void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); + CanOpenDoorReason canOpenDoor(DoorTable::Entry &); void openDoor(); - void closeDoorOffScreen(const tRoomID, const tDirectionConstant); - int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + void closeDoorOffScreen(const RoomID, const DirectionConstant); + int16 getStaticCompassAngle(const RoomID, const DirectionConstant); void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &); void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &); - void turnTo(const tDirectionConstant); - void receiveNotification(Notification *, const tNotificationFlags); + void turnTo(const DirectionConstant); + void receiveNotification(Notification *, const NotificationFlags); void doorOpened(); void setUpReactorEnergyDrain(); Hotspot *getItemScreenSpot(Item *, DisplayElement *); @@ -155,8 +155,8 @@ protected: void doReactorGuess(int32 guess); void bombExplodesInGame(); void didntFindBomb(); - tCanMoveForwardReason canMoveForward(ExitTable::Entry &); - void cantMoveThatWay(tCanMoveForwardReason); + CanMoveForwardReason canMoveForward(ExitTable::Entry &); + void cantMoveThatWay(CanMoveForwardReason); void moveForward(); void bumpIntoWall(); void turnLeft(); @@ -165,7 +165,7 @@ protected: void loadAmbientLoops(); void checkAirlockDoors(); void pickedUpItem(Item *item); - void cantOpenDoor(tCanOpenDoorReason); + void cantOpenDoor(CanOpenDoorReason); void launchMaze007Robot(); void launchMaze015Robot(); void launchMaze101Robot(); @@ -183,7 +183,7 @@ protected: void startUpFromFinishedSpaceChase(); void startUpFromSpaceChase(); void transportToRobotShip(); - void spaceChaseClick(const Input &, const tHotSpotID); + void spaceChaseClick(const Input &, const HotSpotID); void updateCursor(const Common::Point, const Hotspot *); Common::String getSoundSpotsName(); |