From a6c6c74350bb673c178d9756a1625ca128d24f21 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 26 Sep 2012 04:10:32 +0200 Subject: PEGASUS: Remove trailing whitespaces. Powered by: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//' --- engines/pegasus/items/autodragger.cpp | 2 +- engines/pegasus/items/biochips/aichip.cpp | 20 ++++++++++---------- engines/pegasus/items/biochips/biochipitem.h | 6 +++--- engines/pegasus/items/biochips/mapimage.cpp | 6 +++--- engines/pegasus/items/biochips/mapimage.h | 4 ++-- engines/pegasus/items/biochips/opticalchip.h | 4 ++-- engines/pegasus/items/biochips/pegasuschip.cpp | 2 +- engines/pegasus/items/biochips/retscanchip.h | 2 +- engines/pegasus/items/inventory.cpp | 2 +- engines/pegasus/items/inventory.h | 8 ++++---- engines/pegasus/items/inventory/airmask.cpp | 4 ++-- engines/pegasus/items/inventory/gascanister.h | 2 +- engines/pegasus/items/inventory/inventoryitem.h | 12 ++++++------ engines/pegasus/items/inventory/keycard.h | 2 +- engines/pegasus/items/inventorypicture.cpp | 4 ++-- engines/pegasus/items/inventorypicture.h | 10 +++++----- engines/pegasus/items/item.cpp | 2 +- engines/pegasus/items/item.h | 18 +++++++++--------- engines/pegasus/items/itemdragger.cpp | 12 ++++++------ engines/pegasus/items/itemdragger.h | 8 ++++---- engines/pegasus/items/itemlist.h | 4 ++-- 21 files changed, 67 insertions(+), 67 deletions(-) (limited to 'engines/pegasus/items') diff --git a/engines/pegasus/items/autodragger.cpp b/engines/pegasus/items/autodragger.cpp index de03f8118f..40bad14a89 100644 --- a/engines/pegasus/items/autodragger.cpp +++ b/engines/pegasus/items/autodragger.cpp @@ -69,7 +69,7 @@ bool AutoDragger::isDragging() { return isIdling(); } -void AutoDragger::useIdleTime() { +void AutoDragger::useIdleTime() { TimeValue thisTime = getTime(); if (thisTime != _lastTime) { diff --git a/engines/pegasus/items/biochips/aichip.cpp b/engines/pegasus/items/biochips/aichip.cpp index 5e9fc9f8c3..cbcfc363e8 100644 --- a/engines/pegasus/items/biochips/aichip.cpp +++ b/engines/pegasus/items/biochips/aichip.cpp @@ -64,36 +64,36 @@ AIChip::AIChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID _briefingSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 10, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 10 + 81, kAIMiddleAreaTop + 27 + 31)); _briefingSpot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_briefingSpot); - + _scanSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 100, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 100 + 81, kAIMiddleAreaTop + 27 + 31)); _scanSpot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_scanSpot); - + _hint1Spot.setArea(Common::Rect(kAIMiddleAreaLeft + 70, kAIMiddleAreaTop + 67, kAIMiddleAreaLeft + 70 + 21, kAIMiddleAreaTop + 67 + 21)); _hint1Spot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_hint1Spot); - + _hint2Spot.setArea(Common::Rect(kAIMiddleAreaLeft + 91, kAIMiddleAreaTop + 67, kAIMiddleAreaLeft + 91 + 20, kAIMiddleAreaTop + 67 + 21)); _hint2Spot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_hint2Spot); - + _hint3Spot.setArea(Common::Rect(kAIMiddleAreaLeft + 111, kAIMiddleAreaTop + 67, kAIMiddleAreaLeft + 111 + 20, kAIMiddleAreaTop + 67 + 21)); _hint3Spot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_hint3Spot); - + _solveSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 131, kAIMiddleAreaTop + 67, kAIMiddleAreaLeft + 131 + 50, kAIMiddleAreaTop + 67 + 21)); _solveSpot.setHotspotFlags(kAIBiochipSpotFlag); g_allHotspots.push_back(&_solveSpot); - + _playingMovie = false; setItemState(kAI000); - + g_AIChip = this; } AIChip::~AIChip() { g_AIChip = NULL; - + g_allHotspots.removeOneHotspot(kAIBriefingSpotID); g_allHotspots.removeOneHotspot(kAIScanSpotID); g_allHotspots.removeOneHotspot(kAIHint1SpotID); @@ -111,7 +111,7 @@ void AIChip::takeSharedArea() { setUpAIChip(); } -void AIChip::setUpAIChip() { +void AIChip::setUpAIChip() { if (!_playingMovie) { PegasusEngine *vm = (PegasusEngine *)g_engine; @@ -130,7 +130,7 @@ void AIChip::setUpAIChip() { } // Only does something when there are hints or solves available. -void AIChip::setUpAIChipRude() { +void AIChip::setUpAIChipRude() { if (!_playingMovie) { PegasusEngine *vm = (PegasusEngine *)g_engine; diff --git a/engines/pegasus/items/biochips/biochipitem.h b/engines/pegasus/items/biochips/biochipitem.h index 24b9ae699a..2039e80c6f 100644 --- a/engines/pegasus/items/biochips/biochipitem.h +++ b/engines/pegasus/items/biochips/biochipitem.h @@ -34,12 +34,12 @@ class BiochipItem : public Item { public: BiochipItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant); virtual ~BiochipItem(); - + virtual ItemType getItemType(); - + TimeValue getPanelTime() const { return _biochipInfoPanelTime; } TimeValue getRightAreaTime() const; - + // Must affect images in right area. virtual void select(); virtual void deselect(); diff --git a/engines/pegasus/items/biochips/mapimage.cpp b/engines/pegasus/items/biochips/mapimage.cpp index bd7b8ff910..9f4170d063 100644 --- a/engines/pegasus/items/biochips/mapimage.cpp +++ b/engines/pegasus/items/biochips/mapimage.cpp @@ -265,7 +265,7 @@ void MapImage::readFromStream(Common::ReadStream *stream) { _mappedRooms.readFromStream(stream); } -void MapImage::loadGearRoomIfNecessary() { +void MapImage::loadGearRoomIfNecessary() { if (_whichArea != kMapGearRoom) { _mapImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kMapOfGearRoomPICTID); @@ -288,7 +288,7 @@ void MapImage::loadGearRoomIfNecessary() { } } -void MapImage::loadMazeIfNecessary() { +void MapImage::loadMazeIfNecessary() { if (_whichArea != kMapMaze) { _mapImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kMapOfMazePICTID); @@ -345,7 +345,7 @@ void MapImage::addFlagToMask(const int flag) { // This function can even be sensitive to open doors. // clone2727 notices that it's not, though -void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) { +void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) { CoordType gridX, gridY; switch (_whichArea) { diff --git a/engines/pegasus/items/biochips/mapimage.h b/engines/pegasus/items/biochips/mapimage.h index d596b585c4..49ad9945ee 100644 --- a/engines/pegasus/items/biochips/mapimage.h +++ b/engines/pegasus/items/biochips/mapimage.h @@ -50,9 +50,9 @@ public: void loadMazeIfNecessary(); void unloadImage(); void moveToMapLocation(const NeighborhoodID, const RoomID, const DirectionConstant); - + void draw(const Common::Rect &); - + bool anyFlagSet() { return _mappedRooms.anyFlagSet(); } static const uint32 kNumMappingRooms = (kMars39 - kMars35 + 1) + (kMars60 - kMars60 + 1) + diff --git a/engines/pegasus/items/biochips/opticalchip.h b/engines/pegasus/items/biochips/opticalchip.h index b1ea87bffc..2f66f73d3a 100644 --- a/engines/pegasus/items/biochips/opticalchip.h +++ b/engines/pegasus/items/biochips/opticalchip.h @@ -55,9 +55,9 @@ protected: kOpticalPoseidonExposed, kNumOpticalChipFlags }; - + void setUpOpticalChip(); - + FlagsArray _opticalFlags; Hotspot _ariesHotspot; Hotspot _mercuryHotspot; diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp index 8862271147..fa551fce30 100644 --- a/engines/pegasus/items/biochips/pegasuschip.cpp +++ b/engines/pegasus/items/biochips/pegasuschip.cpp @@ -188,7 +188,7 @@ void PegasusChip::clickInPegasusHotspot() { if (g_energyMonitor) g_energyMonitor->stopEnergyDraining(); - + if (GameState.getTSAState() == kPlayerWentToPrehistoric || GameState.allTimeZonesFinished()) vm->jumpToNewEnvironment(kFullTSAID, kTSA37, kNorth); else diff --git a/engines/pegasus/items/biochips/retscanchip.h b/engines/pegasus/items/biochips/retscanchip.h index e72eaeddaf..153e6cd071 100644 --- a/engines/pegasus/items/biochips/retscanchip.h +++ b/engines/pegasus/items/biochips/retscanchip.h @@ -34,7 +34,7 @@ class RetScanChip : public BiochipItem { public: RetScanChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant); virtual ~RetScanChip() {} - + void searchForLaser(); }; diff --git a/engines/pegasus/items/inventory.cpp b/engines/pegasus/items/inventory.cpp index 16cced3267..57923b105d 100644 --- a/engines/pegasus/items/inventory.cpp +++ b/engines/pegasus/items/inventory.cpp @@ -83,7 +83,7 @@ InventoryResult Inventory::removeItem(Item *item) { InventoryResult Inventory::removeItem(ItemID id) { Item *item = findItemByID(id); - + if (item) { _inventoryList.remove(item); item->setItemOwner(kNoActorID); diff --git a/engines/pegasus/items/inventory.h b/engines/pegasus/items/inventory.h index 099ba52ba7..796ec49556 100644 --- a/engines/pegasus/items/inventory.h +++ b/engines/pegasus/items/inventory.h @@ -43,11 +43,11 @@ class Inventory { public: Inventory(); virtual ~Inventory(); - + WeightType getWeightLimit(); void setWeightLimit(WeightType limit); WeightType getWeight(); - + virtual InventoryResult addItem(Item *item); virtual InventoryResult removeItem(Item *item); virtual InventoryResult removeItem(ItemID id); @@ -60,10 +60,10 @@ public: virtual int32 findIndexOf(ItemID id); int32 getNumItems(); virtual void removeAllItems(); - + void setOwnerID(const ActorID id); ActorID getOwnerID() const; - + uint32 getReferenceCount() { return _referenceCount; } protected: diff --git a/engines/pegasus/items/inventory/airmask.cpp b/engines/pegasus/items/inventory/airmask.cpp index 85d4449f9f..c65dd36102 100644 --- a/engines/pegasus/items/inventory/airmask.cpp +++ b/engines/pegasus/items/inventory/airmask.cpp @@ -62,7 +62,7 @@ void AirMask::writeToStream(Common::WriteStream *stream) { stream->writeUint32BE(_oxygenTimer.getTimeRemaining()); } -void AirMask::readFromStream(Common::ReadStream *stream) { +void AirMask::readFromStream(Common::ReadStream *stream) { _oxygenTimer.stopFuse(); InventoryItem::readFromStream(stream); _oxygenTimer.primeFuse(stream->readUint32BE()); @@ -98,7 +98,7 @@ void AirMask::putMaskOn() { setItemState(newState); } -void AirMask::takeMaskOff() { +void AirMask::takeMaskOff() { uint airLevel = getAirLeft(); ItemState newState = getItemState(); ItemState oldState = newState; diff --git a/engines/pegasus/items/inventory/gascanister.h b/engines/pegasus/items/inventory/gascanister.h index dae72c12cb..7d4d8193f5 100644 --- a/engines/pegasus/items/inventory/gascanister.h +++ b/engines/pegasus/items/inventory/gascanister.h @@ -34,7 +34,7 @@ class GasCanister : public InventoryItem { public: GasCanister(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant); virtual ~GasCanister() {} - + void select(); void takeSharedArea(); }; diff --git a/engines/pegasus/items/inventory/inventoryitem.h b/engines/pegasus/items/inventory/inventoryitem.h index b526463b18..9d78113014 100644 --- a/engines/pegasus/items/inventory/inventoryitem.h +++ b/engines/pegasus/items/inventory/inventoryitem.h @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ - + #ifndef PEGASUS_ITEMS_INVENTORY_INVENTORYITEM_H #define PEGASUS_ITEMS_INVENTORY_INVENTORYITEM_H @@ -41,17 +41,17 @@ class InventoryItem : public Item { public: InventoryItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant); virtual ~InventoryItem(); - + virtual ItemType getItemType(); - + void getPanelTimes(TimeValue &, TimeValue &) const; TimeValue getLeftAreaTime() const; - + void setAnimationTime(const TimeValue); TimeValue getAnimationTime() const; - + virtual void toggleItemState() {} - + // Must affect images in left area. virtual void select(); virtual void deselect(); diff --git a/engines/pegasus/items/inventory/keycard.h b/engines/pegasus/items/inventory/keycard.h index c30c789786..846f40e6e5 100644 --- a/engines/pegasus/items/inventory/keycard.h +++ b/engines/pegasus/items/inventory/keycard.h @@ -34,7 +34,7 @@ class KeyCard : public InventoryItem { public: KeyCard(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant); virtual ~KeyCard() {} - + virtual void toggleItemState(); virtual void setItemState(const ItemState); bool isFlashlightOn(); diff --git a/engines/pegasus/items/inventorypicture.cpp b/engines/pegasus/items/inventorypicture.cpp index 84999c0b22..fc812faae2 100644 --- a/engines/pegasus/items/inventorypicture.cpp +++ b/engines/pegasus/items/inventorypicture.cpp @@ -76,7 +76,7 @@ void InventoryPicture::getItemXY(uint32 index, CoordType &x, CoordType &y) { y = (index / _itemsPerRow) * _itemHeight + _itemY; } -void InventoryPicture::drawItemHighlight(const Common::Rect &r) { +void InventoryPicture::drawItemHighlight(const Common::Rect &r) { if (_highlightImage.isSurfaceValid()) { Common::Rect r2 = _highlightBounds; Common::Rect bounds; @@ -145,7 +145,7 @@ InventoryResult InventoryPicture::addInventoryItem(Item *item) { return result; } -InventoryResult InventoryPicture::removeInventoryItem(Item *item) { +InventoryResult InventoryPicture::removeInventoryItem(Item *item) { InventoryResult result = _inventory->removeItem(item); if (result == kInventoryOK) diff --git a/engines/pegasus/items/inventorypicture.h b/engines/pegasus/items/inventorypicture.h index 18e85ef988..88a4a4ba75 100644 --- a/engines/pegasus/items/inventorypicture.h +++ b/engines/pegasus/items/inventorypicture.h @@ -41,16 +41,16 @@ class InventoryPicture : public InputHandler, public Picture { public: InventoryPicture(const DisplayElementID, InputHandler *, Inventory *); virtual ~InventoryPicture() {} - + void initInventoryImage(Transition *); void throwAwayInventoryImage(); - + void panelUp(); void activateInventoryPicture(); void deactivateInventoryPicture(); void handleInput(const Input &, const Hotspot *); bool wantsCursor() { return false; } - + InventoryResult addInventoryItem(Item *); InventoryResult removeInventoryItem(Item *); void removeAllItems(); @@ -68,7 +68,7 @@ protected: virtual void highlightCurrentItem(); virtual void unhighlightCurrentItem() {} virtual TimeValue getItemPanelTime(Item *) = 0; - + Inventory *_inventory; uint32 _lastReferenceCount; Frame _highlightImage; @@ -114,7 +114,7 @@ class BiochipPicture : public InventoryPicture { public: BiochipPicture(const DisplayElementID, InputHandler *, Inventory *); virtual ~BiochipPicture() {} - + protected: virtual void unhighlightCurrentItem(); virtual TimeValue getItemPanelTime(Item *); diff --git a/engines/pegasus/items/item.cpp b/engines/pegasus/items/item.cpp index a49bb4a466..8089f2b93d 100644 --- a/engines/pegasus/items/item.cpp +++ b/engines/pegasus/items/item.cpp @@ -241,7 +241,7 @@ void Item::deselect() { } } -void Item::getItemStateEntry(ItemStateInfo info, uint32 index, ItemState &state, TimeValue &time) { +void Item::getItemStateEntry(ItemStateInfo info, uint32 index, ItemState &state, TimeValue &time) { if (index < info.numEntries) { state = info.entries[index].itemState; time = info.entries[index].itemTime; diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h index efcf24100c..a1451b2a58 100644 --- a/engines/pegasus/items/item.h +++ b/engines/pegasus/items/item.h @@ -287,32 +287,32 @@ class Item : public IDObject { public: Item(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction); virtual ~Item(); - + // WriteToStream writes everything EXCEPT the item's ID. // It is assumed that the calling function will write and read the ID. virtual void writeToStream(Common::WriteStream *stream); virtual void readFromStream(Common::ReadStream *stream); - + virtual ActorID getItemOwner() const; virtual void setItemOwner(const ActorID owner); - + void getItemRoom(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) const; void setItemRoom(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction); NeighborhoodID getItemNeighborhood() const; - + virtual WeightType getItemWeight(); - + virtual void setItemState(const ItemState state); virtual ItemState getItemState() const; virtual ItemType getItemType() = 0; - + TimeValue getInfoLeftTime() const; void getInfoRightTimes(TimeValue &, TimeValue &) const; TimeValue getSharedAreaTime() const; Sprite *getDragSprite(const DisplayElementID) const; - + /* select -- called when this item becomes current. Also called when the inventory panel holding this item is raised and this is the current item. @@ -324,7 +324,7 @@ public: virtual void select(); virtual void deselect(); virtual bool isSelected() { return _isSelected; } - + virtual void activate() { _isActive = true; } virtual bool isActive() { return _isActive; } virtual void pickedUp() {} @@ -336,7 +336,7 @@ public: // selected. virtual void giveUpSharedArea() {} virtual void takeSharedArea() {} - + void findItemExtra(const uint32 extraID, ItemExtraEntry &entry); protected: diff --git a/engines/pegasus/items/itemdragger.cpp b/engines/pegasus/items/itemdragger.cpp index 9e77ad5745..97fc5a97ac 100644 --- a/engines/pegasus/items/itemdragger.cpp +++ b/engines/pegasus/items/itemdragger.cpp @@ -89,14 +89,14 @@ void SpriteDragger::startTracking(const Input &input) { } } -void SpriteDragger::continueTracking(const Input &input) { +void SpriteDragger::continueTracking(const Input &input) { if (_draggingSprite) { Common::Point rawPoint; input.getInputLocation(rawPoint); if (!_slopRect.contains(rawPoint)) rawPoint = _startRawPoint; - + if (rawPoint != _lastRawPoint) { Common::Point newPoint = rawPoint; pinPointInRect(_limitRect, newPoint); @@ -127,14 +127,14 @@ void SpriteDragger::pinPointInRect(const Common::Rect &r, Common::Point &pt) { } ItemDragger::ItemDragger(PegasusEngine *owner) : _inventoryDropSpot(kInventoryDropSpotID), _biochipDropSpot(kBiochipDropSpotID), - _inventoryHighlight(kInventoryDropHighlightID), _biochipHighlight(kBiochipDropHighlightID) { + _inventoryHighlight(kInventoryDropHighlightID), _biochipHighlight(kBiochipDropHighlightID) { _owner = owner; Common::Rect r(kInventoryDropLeft, kInventoryDropTop, kInventoryDropRight, kInventoryDropBottom); _inventoryDropSpot.setArea(r); _inventoryDropSpot.setHotspotFlags(kDropItemSpotFlag); g_allHotspots.push_back(&_inventoryDropSpot); - + r = Common::Rect(kBiochipDropLeft, kBiochipDropTop, kBiochipDropRight, kBiochipDropBottom); _biochipDropSpot.setArea(r); _biochipDropSpot.setHotspotFlags(kDropBiochipSpotFlag); @@ -144,10 +144,10 @@ ItemDragger::ItemDragger(PegasusEngine *owner) : _inventoryDropSpot(kInventoryDr void ItemDragger::startTracking(const Input &input) { _inventoryHighlight.setDisplayOrder(kInventoryHiliteOrder); _inventoryHighlight.startDisplaying(); - + _biochipHighlight.setDisplayOrder(kBiochipHiliteOrder); _biochipHighlight.startDisplaying(); - + SpriteDragger::startTracking(input); } diff --git a/engines/pegasus/items/itemdragger.h b/engines/pegasus/items/itemdragger.h index 69612316f3..fce953d695 100644 --- a/engines/pegasus/items/itemdragger.h +++ b/engines/pegasus/items/itemdragger.h @@ -46,16 +46,16 @@ public: void setDragConstraints(const Common::Rect &, const Common::Rect &); void getDragConstraints(Common::Rect &, Common::Rect &) const; - + void startTracking(const Input &); void continueTracking(const Input&); - + Hotspot *getLastHotspot() const { return _lastHotspot; } protected: virtual void enterHotspot(Hotspot *) {} virtual void exitHotspot(Hotspot *) {} - + Sprite *_draggingSprite; Common::Point _startPoint, _lastPoint, _dragOffset; Common::Point _startRawPoint, _lastRawPoint; @@ -83,7 +83,7 @@ public: protected: virtual void enterHotspot(Hotspot *); virtual void exitHotspot(Hotspot *); - + PegasusEngine *_owner; DropHighlight _inventoryHighlight; Hotspot _inventoryDropSpot; diff --git a/engines/pegasus/items/itemlist.h b/engines/pegasus/items/itemlist.h index 173a54104d..9b59206ab3 100644 --- a/engines/pegasus/items/itemlist.h +++ b/engines/pegasus/items/itemlist.h @@ -43,10 +43,10 @@ class ItemList : public Common::List { public: ItemList(); virtual ~ItemList(); - + virtual void writeToStream(Common::WriteStream *stream); virtual void readFromStream(Common::ReadStream *stream); - + Item *findItemByID(const ItemID id); }; -- cgit v1.2.3