aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/continue_save_dialog.cpp2
-rw-r--r--engines/titanic/debugger.cpp2
-rw-r--r--engines/titanic/game/bomb.cpp4
-rw-r--r--engines/titanic/npcs/deskbot.cpp2
-rw-r--r--engines/titanic/sound/music_room_handler.cpp2
-rw-r--r--engines/titanic/sound/music_song.cpp4
-rw-r--r--engines/titanic/star_control/camera_auto_mover.h6
-rw-r--r--engines/titanic/star_control/marked_auto_mover.h2
-rw-r--r--engines/titanic/star_control/star_closeup.cpp12
-rw-r--r--engines/titanic/star_control/viewport.h14
-rw-r--r--engines/titanic/true_talk/tt_parser.cpp2
11 files changed, 26 insertions, 26 deletions
diff --git a/engines/titanic/continue_save_dialog.cpp b/engines/titanic/continue_save_dialog.cpp
index 6de267e9fe..0aee87328b 100644
--- a/engines/titanic/continue_save_dialog.cpp
+++ b/engines/titanic/continue_save_dialog.cpp
@@ -185,7 +185,7 @@ void CContinueSaveDialog::mouseMove(const Point &mousePos) {
void CContinueSaveDialog::leftButtonDown(const Point &mousePos) {
Rect eye1(188, 190, 192, 195), eye2(209, 192, 213, 197);
- if (g_vm->_events->isSpecialPressed(MK_SHIFT) &&
+ if (g_vm->_events->isSpecialPressed(MK_SHIFT) &&
(eye1.contains(mousePos) || eye2.contains(mousePos))) {
// Show the Easter Egg "Evil Twin"
_evilTwinShown = true;
diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp
index 7438a0053b..01948dd4d3 100644
--- a/engines/titanic/debugger.cpp
+++ b/engines/titanic/debugger.cpp
@@ -357,7 +357,7 @@ bool Debugger::cmdFrame(int argc, const char **argv) {
if (argc == 3) {
CGameObject *obj = dynamic_cast<CGameObject *>(
g_vm->_window->_project->findByName(argv[1]));
-
+
if (obj) {
obj->loadFrame(strToInt(argv[2]));
return false;
diff --git a/engines/titanic/game/bomb.cpp b/engines/titanic/game/bomb.cpp
index d9eb737c34..40651c0a88 100644
--- a/engines/titanic/game/bomb.cpp
+++ b/engines/titanic/game/bomb.cpp
@@ -374,7 +374,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) {
addTimer(0, 100, 0);
return true;
}
-
+
if (msg->_actionVal == 0) {
addTimer(1, 1000, 0);
} else {
@@ -459,7 +459,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) {
--_countdown;
addTimer(0, 1000, 0);
}
-
+
return true;
}
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index ee639c908f..c23fefce91 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -301,7 +301,7 @@ bool CDeskbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg)
CTurnOff turnOff;
CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg);
-
+
if (g_language == Common::DE_DEU) {
switch (msg->_dialogueId) {
case 41701:
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index 2265e46bb2..364023ea3a 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -230,7 +230,7 @@ void CMusicRoomHandler::updateAudio() {
}
}
}
-
+
_audioBuffer->push(audioData, size);
delete[] audioData;
}
diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp
index ea5f29a536..1645004c0a 100644
--- a/engines/titanic/sound/music_song.cpp
+++ b/engines/titanic/sound/music_song.cpp
@@ -127,7 +127,7 @@ bool CSongParser::parse(CValuePair &r) {
} else if (_currentChar == '^') {
if (_flag)
break;
-
+
_flag = true;
r._data = 0x7FFFFFFF;
r._length = _field10;
@@ -176,7 +176,7 @@ bool CSongParser::parse(CValuePair &r) {
FETCH_CHAR;
}
}
-
+
if (!_flag)
return false;
diff --git a/engines/titanic/star_control/camera_auto_mover.h b/engines/titanic/star_control/camera_auto_mover.h
index db57627e33..d9b2888fc8 100644
--- a/engines/titanic/star_control/camera_auto_mover.h
+++ b/engines/titanic/star_control/camera_auto_mover.h
@@ -62,17 +62,17 @@ public:
/**
* Clear src and dest orientation and set some default values for other fields
- */
+ */
void clear();
/**
* Setup a transition to from one position to another
- */
+ */
void setPath(const FVector &srcV, const FVector &destV);
/**
* Applys speeds to the mover. More than one application is usually done for several transitions
- */
+ */
virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return DONE_MOVING; }
/**
* Given a distance to cover, determines a bunch of speeds for a gradual transition
diff --git a/engines/titanic/star_control/marked_auto_mover.h b/engines/titanic/star_control/marked_auto_mover.h
index ca7fbf3b7f..d5f714b3ae 100644
--- a/engines/titanic/star_control/marked_auto_mover.h
+++ b/engines/titanic/star_control/marked_auto_mover.h
@@ -46,7 +46,7 @@ public:
/**
* Applys speeds to the mover. More than one application is usually done for several transitions
- */
+ */
virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation);
};
diff --git a/engines/titanic/star_control/star_closeup.cpp b/engines/titanic/star_control/star_closeup.cpp
index 6ec94bbf38..3bc3623d58 100644
--- a/engines/titanic/star_control/star_closeup.cpp
+++ b/engines/titanic/star_control/star_closeup.cpp
@@ -69,9 +69,9 @@ bool CStarCloseup::setup2(int val1, int val2) {
const int VALUES1[] = { 0x800, 0xC00, 0x1000, 0x1400, 0x1800 };
const int VALUES2[] = {
0xF95BCD, 0xA505A0, 0xFFAD43, 0x98F4EB, 0xF3EFA5, 0,
- 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4,
- 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5,
- 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8
+ 0xFFFFFF, 0x81EEF5, 0x5FFD3, 0x4EE4FA, 0x11C3FF, 0x28F3F4,
+ 0x36FCF2, 0x29F1FD, 0x29BCFD, 0x98E3F4, 0xBBF3D9, 0x8198F5,
+ 0x5BE4F9, 0x0D6E2, 0x74EEF6, 0x68DEF8
};
Entry *e = &_entries[0];
@@ -174,7 +174,7 @@ bool CStarCloseup::setup2(int val1, int val2) {
e->_pixel2 = (val >> 8) & 0xff;
e->_pixel3 = (val >> 16) & 0xff;
e->_field8 = g_vm->getRandomNumber(3) + 3;
-
+
e->_fieldC = g_vm->getRandomNumber(255);
e->_field10 = FACTOR * (float)g_vm->getRandomNumber(15);
e->_field14 = ((float)g_vm->getRandomNumber(0xfffffffe)
@@ -293,7 +293,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector
}
switch (starColor) {
- case WHITE:
+ case WHITE:
surfaceArea->setMode(SA_SOLID);
surfaceArea->_pixel = MKTAG_BE(entryP->_pixel1, entryP->_pixel2,
entryP->_pixel3, 0);
@@ -424,7 +424,7 @@ void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector
surfaceArea->drawLine(FRect(grid1._position._x, grid1._position._y,
grid2._position._x, grid2._position._y));
}
- }
+ }
break;
case PINK:
surfaceArea->setMode(SA_SOLID);
diff --git a/engines/titanic/star_control/viewport.h b/engines/titanic/star_control/viewport.h
index 082d063233..ae42e84ea4 100644
--- a/engines/titanic/star_control/viewport.h
+++ b/engines/titanic/star_control/viewport.h
@@ -35,7 +35,7 @@ namespace Titanic {
* For starview it should be white
* For skyview it should be pink
*/
-enum StarColor { WHITE = 0, PINK = 2 };
+enum StarColor { WHITE = 0, PINK = 2 };
/**
* Implements the viewport functionality for viewing the star field in
@@ -111,14 +111,14 @@ public:
* The view has changed between starview and skyview
* Change the enum that tracks the color of the stars
* Also change the X coordinate pixel offset used for star drawing
- */
+ */
void changeStarColorPixel(StarMode mode, double pixelOffSet);
void reposition(double factor);
/**
* Applys a rotation matrix to the current
* orientation
- */
+ */
void changeOrientation(const FMatrix &matrix);
FPose getPose();
@@ -148,15 +148,15 @@ public:
/**
* Sets the center vector y angle
* The actual center y value doesn't
- * change untill reset is called
- */
+ * change untill reset is called
+ */
void setCenterYAngle(double angleDegrees);
/**
* Sets the center vector z angle
* The actual center z value doesn't
- * change untill reset is called
- */
+ * change untill reset is called
+ */
void setCenterZAngle(double angleDegrees);
};
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 75fd01e506..2caeef45dd 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -1760,7 +1760,7 @@ void TTparser::preprocessGerman(TTstring &line) {
continue;
const char *wordEndP = p + _replacements4[idx].size();
-
+
for (int sIdx = 0; sIdx < 12; ++sIdx) {
const char *suffixP = SUFFIXES[sIdx];
if (!strncmp(wordEndP, suffixP, strlen(suffixP))) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 20:23:40 +0000