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/norad/delta | |
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/norad/delta')
-rw-r--r-- | engines/pegasus/neighborhood/norad/delta/globegame.cpp | 24 | ||||
-rw-r--r-- | engines/pegasus/neighborhood/norad/delta/globegame.h | 2 | ||||
-rw-r--r-- | engines/pegasus/neighborhood/norad/delta/noraddelta.cpp | 40 |
3 files changed, 33 insertions, 33 deletions
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp index 7d4c1c5f8f..06e40c2b3a 100644 --- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp +++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp @@ -217,7 +217,7 @@ static const int kGlobeCountdownHeight = 12; static const int kGlobeCountdownOffset1 = 12; static const int kGlobeCountdownOffset2 = 20; -GlobeCountdown::GlobeCountdown(const DisplayElementID id) : IdlerAnimation(id) { +GlobeCountdown::GlobeCountdown(const DisplayElementID id) : IdlerAnimation(id) { _digits.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kGlobeCountdownDigitsID); Common::Rect r; @@ -271,11 +271,11 @@ void GlobeCountdown::draw(const Common::Rect &) { r2.moveTo(bounds.left, bounds.top); r1.moveTo(9 * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); - + r2.moveTo(bounds.left + kGlobeCountdownOffset1, bounds.top); r1.moveTo(5 * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); - + r2.moveTo(bounds.left + kGlobeCountdownOffset2, bounds.top); r1.moveTo(9 * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); @@ -283,12 +283,12 @@ void GlobeCountdown::draw(const Common::Rect &) { r2.moveTo(bounds.left, bounds.top); r1.moveTo((time / 60) * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); - + time %= 60; r2.moveTo(bounds.left + kGlobeCountdownOffset1, bounds.top); r1.moveTo((time / 10) * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); - + r2.moveTo(bounds.left + kGlobeCountdownOffset2, bounds.top); r1.moveTo((time % 10) * _digitOffset, 0); _digits.copyToCurrentPort(r1, r2); @@ -452,7 +452,7 @@ void GlobeGame::openInteraction() { _monitorMovie.startDisplaying(); _monitorMovie.setSegment(0, kSplash1End * _monitorMovie.getScale()); _monitorMovie.show(); - + _monitorCallBack.setNotification(&_globeNotification); _monitorCallBack.initCallBack(&_monitorMovie, kCallBackAtExtremes); _monitorCallBack.setCallBackFlag(kGlobeSplash1Finished); @@ -863,7 +863,7 @@ void GlobeGame::spinGlobe(const Input &input, const Hotspot *spot, GlobeTrackDir _globeTracker.startTracking(input); } -void GlobeGame::clickGlobe(const Input &input) { +void GlobeGame::clickGlobe(const Input &input) { int16 newSilo = findClickedSilo(input); if (newSilo != -1) { @@ -968,9 +968,9 @@ void GlobeGame::globeMovieFrameToOrigin(int16 frameNum, int16 &latOrigin, int16 } void GlobeGame::globePointToLatLong(const GlobeGame::Point3D &pt, int16 latOrigin, int16 longOrigin, - int16 &latitude, int16 &longitude) { + int16 &latitude, int16 &longitude) { Point3D scratch = pt; - + // Translate globe center to origin. scratch.x -= kGlobeCenter.x; scratch.y -= kGlobeCenter.y; @@ -984,7 +984,7 @@ void GlobeGame::globePointToLatLong(const GlobeGame::Point3D &pt, int16 latOrigi float y = scratch.y * c + scratch.x * s; scratch.x = x; scratch.y = y; - + // Calculate latitude latitude = (int16)radiansToDegrees(asin(scratch.y / kGlobeRadius)); @@ -996,7 +996,7 @@ void GlobeGame::globePointToLatLong(const GlobeGame::Point3D &pt, int16 latOrigi float z = scratch.z * c + scratch.x * s; scratch.x = x; scratch.z = z; - + // Calculate longitude longitude = (int16)radiansToDegrees(acos(scratch.x / sqrt(scratch.x * scratch.x + scratch.z * scratch.z))); @@ -1014,7 +1014,7 @@ void GlobeGame::screenPointTo3DPoint(int16 h, int16 v, GlobeGame::Point3D &pt) { // Fundamentals of Three-Dimensional Graphics, by Alan Watt // pp. 163-164 -bool GlobeGame::lineHitsGlobe(const GlobeGame::Line3D &line, GlobeGame::Point3D &pt) { +bool GlobeGame::lineHitsGlobe(const GlobeGame::Line3D &line, GlobeGame::Point3D &pt) { float i = line.pt2.x - line.pt1.x; float j = line.pt2.y - line.pt1.y; float k = line.pt2.z - line.pt1.z; diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.h b/engines/pegasus/neighborhood/norad/delta/globegame.h index 9c31a931fc..73ed48866f 100644 --- a/engines/pegasus/neighborhood/norad/delta/globegame.h +++ b/engines/pegasus/neighborhood/norad/delta/globegame.h @@ -101,7 +101,7 @@ public: void handleInput(const Input &, const Hotspot *); void clickInHotspot(const Input &, const Hotspot *); void activateHotspots(); - + bool canSolve(); void doSolve(); diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp index 01530023c8..f2ea53ff89 100644 --- a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp +++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp @@ -62,8 +62,8 @@ const uint32 NoradDelta::_noradDeltaClawExtras[22] = { kN60ClawDCounterclockwise, kN60ClawDClockwise }; - -NoradDelta::NoradDelta(InputHandler *nextHandler, PegasusEngine *owner) : Norad(nextHandler, owner, "Norad Delta", kNoradDeltaID) { + +NoradDelta::NoradDelta(InputHandler *nextHandler, PegasusEngine *owner) : Norad(nextHandler, owner, "Norad Delta", kNoradDeltaID) { _elevatorUpRoomID = kNorad49South; _elevatorDownRoomID = kNorad48South; _elevatorUpSpotID = kNorad48ElevatorUpSpotID; @@ -98,41 +98,41 @@ NoradDelta::NoradDelta(InputHandler *nextHandler, PegasusEngine *owner) : Norad( _subControlRoom = kNorad60West; } -void NoradDelta::init() { +void NoradDelta::init() { Norad::init(); // Little fix for the retinal scan zoom in spot... Hotspot *hotspot = _vm->getAllHotspots().findHotspotByID(kNorad68WestSpotID); hotspot->setMaskedHotspotFlags(kZoomInSpotFlag, kZoomInSpotFlag | kZoomOutSpotFlag); - + hotspot = _vm->getAllHotspots().findHotspotByID(kNorad79WestSpotID); hotspot->setMaskedHotspotFlags(kZoomInSpotFlag, kZoomInSpotFlag | kZoomOutSpotFlag); - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta59RobotShieldBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); HotspotInfoTable::Entry *hotspotEntry = findHotspotEntry(kDelta59RobotShieldBiochipSpotID); hotspotEntry->hotspotItem = kShieldBiochip; - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta59RobotOpMemBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); hotspotEntry = findHotspotEntry(kDelta59RobotOpMemBiochipSpotID); hotspotEntry->hotspotItem = kOpticalBiochip; - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta59RobotRetinalBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); hotspotEntry = findHotspotEntry(kDelta59RobotRetinalBiochipSpotID); hotspotEntry->hotspotItem = kRetinalScanBiochip; - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta60RobotShieldBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); hotspotEntry = findHotspotEntry(kDelta60RobotShieldBiochipSpotID); hotspotEntry->hotspotItem = kShieldBiochip; - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta60RobotOpMemBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); hotspotEntry = findHotspotEntry(kDelta60RobotOpMemBiochipSpotID); hotspotEntry->hotspotItem = kOpticalBiochip; - + hotspot = _vm->getAllHotspots().findHotspotByID(kDelta60RobotRetinalBiochipSpotID); hotspot->setMaskedHotspotFlags(kPickUpBiochipSpotFlag, kPickUpBiochipSpotFlag); hotspotEntry = findHotspotEntry(kDelta60RobotRetinalBiochipSpotID); @@ -150,7 +150,7 @@ void NoradDelta::start() { Norad::start(); } -void NoradDelta::setUpAIRules() { +void NoradDelta::setUpAIRules() { Neighborhood::setUpAIRules(); if (g_AIArea) { @@ -228,10 +228,10 @@ void NoradDelta::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) { } } -void NoradDelta::loadAmbientLoops() { +void NoradDelta::loadAmbientLoops() { /* Logic: - + loop sound 1: if room == kNorad79West if player globe game @@ -261,7 +261,7 @@ void NoradDelta::loadAmbientLoops() { else play nothing */ - + if (GameState.getNoradArrivedFromSub()) { RoomID room = GameState.getCurrentRoom(); @@ -391,7 +391,7 @@ void NoradDelta::arriveAtNorad68West() { } } -void NoradDelta::arriveAtNorad79West() { +void NoradDelta::arriveAtNorad79West() { if (!GameState.getNoradPlayedGlobeGame()) newInteraction(kNoradGlobeGameInteractionID); } @@ -464,7 +464,7 @@ void NoradDelta::playerBeatRobotWithClaw() { TimeValue NoradDelta::getViewTime(const RoomID room, const DirectionConstant direction) { ExtraTable::Entry entry; - + if (room == kNorad41 && direction == kSouth && !GameState.getNoradArrivedFromSub()) { getExtraEntry(kArriveFromSubChase, entry); return entry.movieStart; @@ -505,7 +505,7 @@ TimeValue NoradDelta::getViewTime(const RoomID room, const DirectionConstant dir return Norad::getViewTime(room, direction); } -void NoradDelta::openDoor() { +void NoradDelta::openDoor() { if (GameState.getCurrentRoom() == kNorad59 && GameState.getCurrentDirection() == kWest && GameState.getNoradPlayedGlobeGame()) { Input scratch; InputHandler::_inputHandler->clickInHotspot(scratch, _vm->getAllHotspots().findHotspotByID(kNorad59WestSpotID)); @@ -582,7 +582,7 @@ void NoradDelta::clickInHotspot(const Input &input, const Hotspot *clickedSpot) } } -void NoradDelta::receiveNotification(Notification *notification, const NotificationFlags flags) { +void NoradDelta::receiveNotification(Notification *notification, const NotificationFlags flags) { Norad::receiveNotification(notification, flags); if ((flags & kExtraCompletedFlag) != 0) { @@ -703,7 +703,7 @@ void NoradDelta::dropItemIntoRoom(Item *item, Hotspot *hotspot) { Hotspot *NoradDelta::getItemScreenSpot(Item *item, DisplayElement *element) { HotSpotID id = kNoHotSpotID; - + switch (item->getObjectID()) { case kShieldBiochip: if (GameState.getNoradBeatRobotWithDoor()) @@ -735,7 +735,7 @@ Common::String NoradDelta::getEnvScanMovie() { return "Images/AI/Norad/XNE2"; } -uint NoradDelta::getNumHints() { +uint NoradDelta::getNumHints() { uint numHints = Neighborhood::getNumHints(); if (numHints == 0) { |