aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/items/biochips
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-26 04:10:32 +0200
committerJohannes Schickel2012-09-26 04:11:09 +0200
commita6c6c74350bb673c178d9756a1625ca128d24f21 (patch)
tree5d88c0cef3a2b40fdfe6e10d8b20904ff75bddf8 /engines/pegasus/items/biochips
parentd9b204b78ea2c7636af7e8fcffd67065a6d08d84 (diff)
downloadscummvm-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/items/biochips')
-rw-r--r--engines/pegasus/items/biochips/aichip.cpp20
-rw-r--r--engines/pegasus/items/biochips/biochipitem.h6
-rw-r--r--engines/pegasus/items/biochips/mapimage.cpp6
-rw-r--r--engines/pegasus/items/biochips/mapimage.h4
-rw-r--r--engines/pegasus/items/biochips/opticalchip.h4
-rw-r--r--engines/pegasus/items/biochips/pegasuschip.cpp2
-rw-r--r--engines/pegasus/items/biochips/retscanchip.h2
7 files changed, 22 insertions, 22 deletions
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<byte, kNumOpticalChipFlags> _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();
};