diff options
author | Johannes Schickel | 2012-09-26 04:10:32 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-09-26 04:11:09 +0200 |
commit | a6c6c74350bb673c178d9756a1625ca128d24f21 (patch) | |
tree | 5d88c0cef3a2b40fdfe6e10d8b20904ff75bddf8 /engines/pegasus/neighborhood/prehistoric | |
parent | d9b204b78ea2c7636af7e8fcffd67065a6d08d84 (diff) | |
download | scummvm-rg350-a6c6c74350bb673c178d9756a1625ca128d24f21.tar.gz scummvm-rg350-a6c6c74350bb673c178d9756a1625ca128d24f21.tar.bz2 scummvm-rg350-a6c6c74350bb673c178d9756a1625ca128d24f21.zip |
PEGASUS: Remove trailing whitespaces.
Powered by: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/pegasus/neighborhood/prehistoric')
-rw-r--r-- | engines/pegasus/neighborhood/prehistoric/prehistoric.cpp | 24 | ||||
-rw-r--r-- | engines/pegasus/neighborhood/prehistoric/prehistoric.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp index 11e28f072d..814d7717de 100644 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp @@ -85,7 +85,7 @@ uint16 Prehistoric::getDateResID() const { void Prehistoric::init() { Neighborhood::init(); - + // Forces a stop so the flashlight can turn off... forceStridingStop(kPrehistoric12, kSouth, kNoAlternateID); } @@ -105,7 +105,7 @@ class FinishPrehistoricAction : public AIPlayMessageAction { public: FinishPrehistoricAction() : AIPlayMessageAction("Images/AI/Prehistoric/XP25W", false) {} ~FinishPrehistoricAction() {} - + void performAIAction(AIRule *); }; @@ -130,36 +130,36 @@ void Prehistoric::setUpAIRules() { locCondition->addLocation(MakeRoomView(kPrehistoric16, kNorth)); AIRule *rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP2SB", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kPrehistoric01, kSouth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP2SB", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kPrehistoric08, kEast)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP2SB", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kPrehistoric25, kWest)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP16NB", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kPrehistoric23, kNorth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP18NB", false); AITimerCondition *timerCondition = new AITimerCondition(kPrehistoricWarningTimeLimit, 1, true); rule = new AIRule(timerCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Prehistoric/XP25W", false); AIHasItemCondition *hasLogCondition = new AIHasItemCondition(kHistoricalLog); rule = new AIRule(hasLogCondition, messageAction); @@ -191,7 +191,7 @@ TimeValue Prehistoric::getViewTime(const RoomID room, const DirectionConstant di if (extraID == 0xffffffff) return Neighborhood::getViewTime(room, direction); - + getExtraEntry(extraID, extra); return extra.movieEnd - 1; } @@ -322,7 +322,7 @@ void Prehistoric::checkContinuePoint(const RoomID room, const DirectionConstant void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) { Item *keyCard; - + if (MakeRoomView(room, direction) == MakeRoomView(kPrehistoric25, kEast) && _privateFlags.getFlag(kPrehistoricPrivateExtendedBridgeFlag)) { _navMovie.stop(); @@ -398,7 +398,7 @@ void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) void Prehistoric::loadAmbientLoops() { RoomID room = GameState.getCurrentRoom(); - + switch (room) { case kPrehistoric02: // 1/4 volume. @@ -592,7 +592,7 @@ Common::String Prehistoric::getEnvScanMovie() { uint Prehistoric::getNumHints() { uint numHints = Neighborhood::getNumHints(); - + if (numHints == 0) { switch (GameState.getCurrentRoomAndView()) { case MakeRoomView(kPrehistoric18, kEast): diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.h b/engines/pegasus/neighborhood/prehistoric/prehistoric.h index 2750fc0ee8..17f9993014 100644 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.h +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.h @@ -104,10 +104,10 @@ class Prehistoric : public Neighborhood { public: Prehistoric(InputHandler *, PegasusEngine *); virtual ~Prehistoric() {} - + virtual uint16 getDateResID() const; virtual void init(); - + virtual void arriveAt(const RoomID, const DirectionConstant); virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); @@ -146,7 +146,7 @@ protected: void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); void loadAmbientLoops(); - + FlagsArray<byte, kNumPrehistoricPrivateFlags> _privateFlags; Common::String getNavMovieName(); |