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/wsc/wsc.cpp | |
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/wsc/wsc.cpp')
-rw-r--r-- | engines/pegasus/neighborhood/wsc/wsc.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp index 8e5f2e2ca4..f3bf113333 100644 --- a/engines/pegasus/neighborhood/wsc/wsc.cpp +++ b/engines/pegasus/neighborhood/wsc/wsc.cpp @@ -481,7 +481,7 @@ WSC::WSC(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHan setIsItemTaken(kAntidote); setIsItemTaken(kMachineGun); setIsItemTaken(kStunGun); - + GameState.setTakenItemID(kArgonPickup, GameState.isTakenItemID(kArgonCanister) && GameState.isTakenItemID(kSinclairKey)); } @@ -492,10 +492,10 @@ uint16 WSC::getDateResID() const { void WSC::init() { Neighborhood::init(); - + _cachedZoomSpot = 0; _argonSprite = 0; - + // HACK: Fix the drag item for picking up the Sinclair Key Card HotspotInfoTable::Entry *entry = findHotspotEntry(kWSC02SouthTakeArgonSpotID); entry->hotspotItem = kArgonPickup; @@ -512,10 +512,10 @@ void WSC::start() { _vm->resetEnergyDeathReason(); g_energyMonitor->startEnergyDraining(); } - + if (!GameState.getWSCDidPlasmaDodge()) forceStridingStop(kWSC58, kSouth, kAltWSCNormal); - + Neighborhood::start(); } @@ -547,59 +547,59 @@ void WSC::setUpAIRules() { locCondition->addLocation(MakeRoomView(kWSC06, kNorth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC10, kWest)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC28, kWest)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC49, kWest)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC65, kSouth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC73, kSouth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB5A", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC79, kWest)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/WSC/XW59SD1", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC58, kSouth)); rule = new AIRule(locCondition, messageAction); g_AIArea->addAIRule(rule); - + PryDoorMessage *pryDoorMessage = new PryDoorMessage(); AIDoorOpenedCondition *doorCondition = new AIDoorOpenedCondition(MakeRoomView(kWSC58, kSouth)); rule = new AIRule(doorCondition, pryDoorMessage); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/WSC/XW61E", false); AIHasItemCondition *itemCondition = new AIHasItemCondition(kMachineGun); rule = new AIRule(itemCondition, messageAction); g_AIArea->addAIRule(rule); - + messageAction = new AIPlayMessageAction("Images/AI/Globals/XGLOB1E", false); locCondition = new AILocationCondition(1); locCondition->addLocation(MakeRoomView(kWSC95, kWest)); @@ -614,7 +614,7 @@ Common::String WSC::getBriefingMovie() { Common::String WSC::getEnvScanMovie() { RoomID room = GameState.getCurrentRoom(); - + if (room >= kWSC01 && room <= kWSC04) return "Images/AI/WSC/XWE1"; else if (room >= kWSC06 && room <= kWSC58) @@ -831,7 +831,7 @@ void WSC::cleanUpAfterAIHint(const Common::String &movieName) { resumeTimer(); } -bool WSC::okayToJump() { +bool WSC::okayToJump() { if (GameState.getWSCPoisoned()) { die(kDeathDidntStopPoison); return false; @@ -1427,7 +1427,7 @@ void WSC::checkContinuePoint(const RoomID room, const DirectionConstant directio } } -void WSC::arriveAt(const RoomID room, const DirectionConstant dir) { +void WSC::arriveAt(const RoomID room, const DirectionConstant dir) { switch (MakeRoomView(room, dir)) { case MakeRoomView(kWSC60, kNorth): case MakeRoomView(kWSC60, kSouth): @@ -1537,7 +1537,7 @@ void WSC::arriveAt(const RoomID room, const DirectionConstant dir) { if (!GameState.getWSCSeenSinclairLecture()) { GameState.setWSCSeenSinclairLecture(true); startExtraSequence(kW65SouthSinclairLecture, kExtraCompletedFlag, kFilterAllInput); - } + } break; case MakeRoomView(kWSC66, kWest): case MakeRoomView(kWSC67, kEast): @@ -1647,7 +1647,7 @@ void WSC::turnTo(const DirectionConstant direction) { void WSC::receiveNotification(Notification *notification, const NotificationFlags flags) { int32 currentEnergy; Item *item; - + if (flags & kExtraCompletedFlag) { _interruptionFilter = kFilterAllInput; @@ -2195,7 +2195,7 @@ void WSC::clickInHotspot(const Input &input, const Hotspot *clickedSpot) { } else { Neighborhood::clickInHotspot(input, clickedSpot); } - + GameState.setEasterEgg(false); } @@ -2295,7 +2295,7 @@ void WSC::takeItemFromRoom(Item *item) { Hotspot *WSC::getItemScreenSpot(Item *item, DisplayElement *element) { HotSpotID destSpotID; - + switch (item->getObjectID()) { case kNitrogenCanister: destSpotID = kWSC02SouthTakeNitrogenSpotID; @@ -2329,7 +2329,7 @@ Hotspot *WSC::getItemScreenSpot(Item *item, DisplayElement *element) { return _vm->getAllHotspots().findHotspotByID(destSpotID); } -void WSC::pickedUpItem(Item *item) { +void WSC::pickedUpItem(Item *item) { switch (item->getObjectID()) { case kAntidote: if (!GameState.getWSCPickedUpAntidote()) { |