aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorAdrian Frühwirth2018-05-22 16:03:56 +0200
committerAdrian Frühwirth2018-05-24 15:30:55 +0200
commitcee4d6b8531453c9db921bb987be88995ce86586 (patch)
tree144d1ae98d26235227393c6f0e1c332f32b21a40 /engines/titanic
parentbc949250de1fda6b47b99facbdf0c349835b1f53 (diff)
downloadscummvm-rg350-cee4d6b8531453c9db921bb987be88995ce86586.tar.gz
scummvm-rg350-cee4d6b8531453c9db921bb987be88995ce86586.tar.bz2
scummvm-rg350-cee4d6b8531453c9db921bb987be88995ce86586.zip
JANITORIAL: Fix trailing whitespace
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/game/chicken_dispensor.cpp2
-rw-r--r--engines/titanic/sound/music_room_instrument.cpp2
-rw-r--r--engines/titanic/star_control/base_stars.cpp2
-rw-r--r--engines/titanic/star_control/camera_auto_mover.cpp4
-rw-r--r--engines/titanic/star_control/frect.h2
-rw-r--r--engines/titanic/star_control/star_camera.h2
-rw-r--r--engines/titanic/star_control/star_control.cpp2
-rw-r--r--engines/titanic/star_control/star_crosshairs.h8
-rw-r--r--engines/titanic/star_control/star_field.h6
-rw-r--r--engines/titanic/star_control/star_view.h6
-rw-r--r--engines/titanic/star_control/unmarked_camera_mover.cpp2
-rw-r--r--engines/titanic/star_control/viewport.cpp2
-rw-r--r--engines/titanic/support/avi_surface.cpp2
-rw-r--r--engines/titanic/titanic.cpp2
-rw-r--r--engines/titanic/true_talk/tt_talker.h2
-rw-r--r--engines/titanic/true_talk/tt_vocab.cpp12
16 files changed, 29 insertions, 29 deletions
diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index 8d16289647..ced0c78ef1 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -106,7 +106,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) {
int movieFrame = msg->_endFrame;
-
+
if (movieFrame == 16) {
// Dispensed a chicken
_cursorId = CURSOR_HAND;
diff --git a/engines/titanic/sound/music_room_instrument.cpp b/engines/titanic/sound/music_room_instrument.cpp
index 882325c08a..99ead2f8eb 100644
--- a/engines/titanic/sound/music_room_instrument.cpp
+++ b/engines/titanic/sound/music_room_instrument.cpp
@@ -77,7 +77,7 @@ CMusicRoomInstrument::CMusicRoomInstrument(CProjectItem *project, CSoundManager
_gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Tubular Bells"));
_insStartTime = 0.4;
break;
-
+
case MV_SNAKE:
_gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Snake_Hammer"));
_gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Snake_Glass"));
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp
index 0fcf8a964f..00206b1a9d 100644
--- a/engines/titanic/star_control/base_stars.cpp
+++ b/engines/titanic/star_control/base_stars.cpp
@@ -462,7 +462,7 @@ void CBaseStars::draw4(CSurfaceArea *surfaceArea, CStarCamera *camera, CStarClos
+ vector._z * pose._row3._z + pose._vector._z;
if (tempZ <= minVal)
continue;
-
+
tempY = vector._x * pose._row1._y + vector._y * pose._row2._y + vector._z * pose._row3._y + pose._vector._y;
tempX = vector._x * pose._row1._x + vector._y * pose._row2._x + vector._z * pose._row3._x + pose._vector._x;
total2 = tempY * tempY + tempX * tempX + tempZ * tempZ;
diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp
index 71f7de85b2..d8808653eb 100644
--- a/engines/titanic/star_control/camera_auto_mover.cpp
+++ b/engines/titanic/star_control/camera_auto_mover.cpp
@@ -78,7 +78,7 @@ void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) {
_field40 = nMoverTransitions-1;
_field48 = nMoverTransitions-1;
_field3C = (double)val2 * _field38;
-
+
// Calculate the speeds for a graduated movement between stars
double base = 0.0, total = 0.0, power = 4.0, baseInc = 0.03125;
for (int idx = nMoverTransitions - 1; idx >= 0; --idx) {
@@ -86,7 +86,7 @@ void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) {
total += _speeds[idx];
base += baseInc;
}
-
+
for (int idx = 0; idx < nMoverTransitions; ++idx) {
_speeds[idx] = _speeds[idx] * _field3C / total;
}
diff --git a/engines/titanic/star_control/frect.h b/engines/titanic/star_control/frect.h
index 654c578cfd..d792eb69b4 100644
--- a/engines/titanic/star_control/frect.h
+++ b/engines/titanic/star_control/frect.h
@@ -41,7 +41,7 @@ public:
* Returns true if the rects equal
*/
bool operator==(const FRect &p) const;
-
+
/**
* Returns true if the rects are not equal
*/
diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h
index f2d27212fe..9d0c954765 100644
--- a/engines/titanic/star_control/star_camera.h
+++ b/engines/titanic/star_control/star_camera.h
@@ -234,7 +234,7 @@ public:
* Lock in the first matched star marker
*/
bool lockMarker1(FVector v1, FVector v2, FVector v3);
-
+
/**
* Lock in the second matched star marker
*/
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index 8464262b31..7922a2f7f2 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -241,7 +241,7 @@ void CStarControl::doAction(StarControlAction action) {
pet->starsSetReference();
break;
}
-
+
case STAR_FADE_IN:
_view.fn3(true);
break;
diff --git a/engines/titanic/star_control/star_crosshairs.h b/engines/titanic/star_control/star_crosshairs.h
index d60541c205..3d060fd91d 100644
--- a/engines/titanic/star_control/star_crosshairs.h
+++ b/engines/titanic/star_control/star_crosshairs.h
@@ -80,12 +80,12 @@ public:
bool fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarCamera *camera);
void fn2(CVideoSurface *surface, CStarField *starField, CStarMarkers *markers);
-
+
/**
* Increments the index for the number of matches
*/
void incMatches();
-
+
/**
* Draw the crosshairs for a given star
*/
@@ -101,12 +101,12 @@ public:
* Erase crosshairs for the most recently selected star
*/
void eraseCurrent(CSurfaceArea *surfaceArea);
-
+
/**
* Draw crosshairs at the given position
*/
void drawAt(const FPoint &pt, CSurfaceArea *surfaceArea);
-
+
/**
* Returns the position of the most recently selected star
*/
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index bd3f8aecb6..3b1c3db2b5 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -78,17 +78,17 @@ public:
void set2(int val);
int get54() const;
void set54(int val);
-
+
/**
* Gets the current display mode
*/
StarMode getMode() const;
-
+
/**
* Sets the display mode
*/
void setMode(StarMode mode);
-
+
/**
* Toggles whether the big box is visible
*/
diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h
index 553195b0c7..241efbcde5 100644
--- a/engines/titanic/star_control/star_view.h
+++ b/engines/titanic/star_control/star_view.h
@@ -148,14 +148,14 @@ public:
* Toggles between starfield and photo modes
*/
void toggleMode();
-
+
void fn11();
/**
* Toggles whether the viewpoint box is visible in the starfield
*/
void toggleBox();
-
+
void fn13();
void fn14();
@@ -163,7 +163,7 @@ public:
* Called when the photograph is used on the navigation computer
*/
void setHasReference();
-
+
/**
* Handles locking in a star
*/
diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp
index c879dc25e8..401f550bee 100644
--- a/engines/titanic/star_control/unmarked_camera_mover.cpp
+++ b/engines/titanic/star_control/unmarked_camera_mover.cpp
@@ -48,7 +48,7 @@ void CUnmarkedCameraMover::moveTo(const FVector &srcV, const FVector &destV, con
void CUnmarkedCameraMover::transitionBetweenOrientations(const FVector &v1, const FVector &v2, const FVector &v3, const FMatrix &m) {
if (isLocked())
decLockCount();
-
+
FVector vector1 = v1;
FVector vector2 = v2;
FPose matrix1 = vector2.getFrameTransform(vector1);
diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp
index e368dfa317..d66ff423c6 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -178,7 +178,7 @@ void CViewport::randomizeOrientation() {
FPose m1(X_AXIS, ranRotAngleX);
FPose m2(Y_AXIS, ranRotAngleY);
FPose m3(Z_AXIS, ranRotAngleZ);
-
+
FPose s1(m1, m2);
FPose s2(s1, m3);
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 3b22a4fee2..ff439abe25 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -489,7 +489,7 @@ Graphics::ManagedSurface *AVISurface::duplicateTransparency() const {
bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
if (g_vm->shouldQuit())
return false;
-
+
// TODO: Fixes slight "jumping back" when rotating in place in Top Of Well
// balcony between two elevators. Need a more generalized fix at some point
if (_movieName == "z48.avi")
diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index 5daf399b04..0931d91806 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -190,7 +190,7 @@ void TitanicEngine::setRoomNames() {
bool TitanicEngine::canLoadGameStateCurrently() {
CGameManager *gameManager = _window->_gameManager;
CScreenManager *screenMan = CScreenManager::_screenManagerPtr;
-
+
if (!gameManager)
// Allow loading from copyright screen and continue dialogs
return true;
diff --git a/engines/titanic/true_talk/tt_talker.h b/engines/titanic/true_talk/tt_talker.h
index 4f0b59c044..68b77d8b75 100644
--- a/engines/titanic/true_talk/tt_talker.h
+++ b/engines/titanic/true_talk/tt_talker.h
@@ -54,7 +54,7 @@ public:
* End the speech
*/
void endSpeech(int val);
-
+
/**
* Called when a speech is finished, to signal to the associated character
* that the speech is over
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index eae456b184..0269e71cee 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -225,7 +225,7 @@ TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const {
if (srcWord)
// Pass out the pointer to the original word
*srcWord = vocabP;
-
+
// Return the new copy of the word
return newWord;
}
@@ -267,7 +267,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const {
word = getPrimeWord(tempStr);
}
}
-
+
} else if (tempStr.hasSuffix("ing")) {
tempStr.deleteSuffix(3);
word = getPrimeWord(tempStr);
@@ -303,11 +303,11 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const {
}
}
}
-
+
} else if (tempStr.hasSuffix("ed")) {
tempStr.deleteSuffix(1);
word = getPrimeWord(tempStr);
-
+
if (!word) {
tempStr.deleteSuffix(1);
word = getPrimeWord(tempStr);
@@ -333,7 +333,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const {
} else {
tempStr = str;
}
-
+
} else if (tempStr.hasSuffix("er")) {
tempStr.deleteSuffix(1);
word = getPrimeWord(tempStr);
@@ -395,7 +395,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const {
}
}
}
-
+
} else if (tempStr.hasSuffix("est")) {
tempStr.deleteSuffix(2);
word = getPrimeWord(tempStr);