aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2/ringworld2_speakers.cpp
diff options
context:
space:
mode:
authorStrangerke2012-02-25 12:44:37 +0100
committerStrangerke2012-02-25 12:44:37 +0100
commit9279b25694f16a6166c7eaf677682caeeaed5d7e (patch)
treef827b5ad7e5ed2a89085ce2b261adbd46443a6fc /engines/tsage/ringworld2/ringworld2_speakers.cpp
parent3a3c1eec5374a7d85a18ee55cab0891cd250529b (diff)
downloadscummvm-rg350-9279b25694f16a6166c7eaf677682caeeaed5d7e.tar.gz
scummvm-rg350-9279b25694f16a6166c7eaf677682caeeaed5d7e.tar.bz2
scummvm-rg350-9279b25694f16a6166c7eaf677682caeeaed5d7e.zip
TSAGE: JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_speakers.cpp')
-rw-r--r--engines/tsage/ringworld2/ringworld2_speakers.cpp150
1 files changed, 75 insertions, 75 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index f729881e8f..da1449efdf 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -159,7 +159,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
if (s.empty())
_numFrames = 0;
-
+
if (_fieldF6) {
if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId)
_sceneText.hide();
@@ -229,7 +229,7 @@ void SpeakerCaptain3210::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -285,7 +285,7 @@ void SpeakerChief1100::proc15() {
_object1.setPosition(_object2->_position);
_object1._numFrames = 7;
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -342,7 +342,7 @@ void SpeakerGuard2800::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -382,7 +382,7 @@ void SpeakerJocko3200::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -405,7 +405,7 @@ void SpeakerJocko3220::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -428,7 +428,7 @@ void SpeakerJocko3230::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -442,7 +442,7 @@ void SpeakerJocko3230::proc15() {
}
//----------------------------------------------------------------------------
-// Classes related to MIRANDA
+// Classes related to MIRANDA
//----------------------------------------------------------------------------
SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() {
@@ -472,7 +472,7 @@ void SpeakerMiranda300::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -507,7 +507,7 @@ void SpeakerMiranda1625::proc15() {
_object1.postInit();
_object1.setPosition(Common::Point(196, 65));
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -547,7 +547,7 @@ void SpeakerMiranda3375::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 3)
+ if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor2;
@@ -558,7 +558,7 @@ void SpeakerMiranda3375::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8);
else
@@ -574,7 +574,7 @@ void SpeakerMiranda3375::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -597,7 +597,7 @@ void SpeakerMiranda3385::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 3)
+ if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor2;
@@ -608,7 +608,7 @@ void SpeakerMiranda3385::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4);
else
@@ -623,7 +623,7 @@ void SpeakerMiranda3385::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -646,7 +646,7 @@ void SpeakerMiranda3395::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 3)
+ if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor2;
@@ -657,7 +657,7 @@ void SpeakerMiranda3395::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4);
else
@@ -673,7 +673,7 @@ void SpeakerMiranda3395::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -696,7 +696,7 @@ void SpeakerMiranda3400::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 3)
+ if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor2;
@@ -740,7 +740,7 @@ void SpeakerMiranda3600::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 3)
+ if (R2_GLOBALS._player._characterIndex == 3)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor12;
@@ -858,7 +858,7 @@ void SpeakerNej2700::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -893,7 +893,7 @@ void SpeakerNej2750::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -925,7 +925,7 @@ void SpeakerNej2800::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1002,7 +1002,7 @@ void SpeakerPrivate3210::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1047,7 +1047,7 @@ void SpeakerProtector3600::proc15() {
R2_GLOBALS._player.disableControl();
R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1107,7 +1107,7 @@ void SpeakerQuinn300::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1122,7 +1122,7 @@ void SpeakerQuinn300::proc15() {
_object1.animate(ANIM_MODE_6, this);
} else {
((SceneItem *)_action)->_sceneRegionId = 0;
-
+
switch (_object2->_visage) {
case 10:
_object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1);
@@ -1158,7 +1158,7 @@ void SpeakerQuinn1100::proc15() {
_object1.setPosition(_object2->_position);
_object1._numFrames = 7;
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1250,7 +1250,7 @@ void SpeakerQuinn2700::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1281,7 +1281,7 @@ void SpeakerQuinn2750::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1312,7 +1312,7 @@ void SpeakerQuinn2800::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1371,9 +1371,9 @@ void SpeakerQuinn3375::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 1)
+ if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player;
- else if (R2_GLOBALS._player._characterIndex == 2)
+ else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1;
else
_object2 = &scene->_actor2;
@@ -1384,7 +1384,7 @@ void SpeakerQuinn3375::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8);
else
@@ -1399,7 +1399,7 @@ void SpeakerQuinn3375::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -1422,9 +1422,9 @@ void SpeakerQuinn3385::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 1)
+ if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player;
- else if (R2_GLOBALS._player._characterIndex == 2)
+ else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1;
else
_object2 = &scene->_actor2;
@@ -1435,7 +1435,7 @@ void SpeakerQuinn3385::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4);
else
@@ -1450,7 +1450,7 @@ void SpeakerQuinn3385::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -1477,9 +1477,9 @@ void SpeakerQuinn3395::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 1)
+ if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player;
- else if (R2_GLOBALS._player._characterIndex == 2)
+ else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1;
else
_object2 = &scene->_actor2;
@@ -1490,7 +1490,7 @@ void SpeakerQuinn3395::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4);
else
@@ -1505,7 +1505,7 @@ void SpeakerQuinn3395::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -1532,9 +1532,9 @@ void SpeakerQuinn3400::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 1)
+ if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player;
- else if (R2_GLOBALS._player._characterIndex == 2)
+ else if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &scene->_actor1;
else
_object2 = &scene->_actor2;
@@ -1581,7 +1581,7 @@ void SpeakerQuinn3600::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 1)
+ if (R2_GLOBALS._player._characterIndex == 1)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor10;
@@ -1736,7 +1736,7 @@ void SpeakerRalf3245::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1788,7 +1788,7 @@ void SpeakerRocko3200::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1811,7 +1811,7 @@ void SpeakerRocko3220::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1834,7 +1834,7 @@ void SpeakerRocko3230::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1879,7 +1879,7 @@ void SpeakerSeeker300::proc15() {
_object1.fixPriority(140);
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1918,7 +1918,7 @@ void SpeakerSeeker1100::proc15() {
_object1.setPosition(_object2->_position);
_object1._numFrames = 7;
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -1974,7 +1974,7 @@ void SpeakerSeeker1900::proc15() {
_object1.setPosition(_object2->_position);
_object1._numFrames = 7;
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2045,7 +2045,7 @@ void SpeakerSeeker3375::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 2)
+ if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor1;
@@ -2056,7 +2056,7 @@ void SpeakerSeeker3375::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8);
else
@@ -2071,7 +2071,7 @@ void SpeakerSeeker3375::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -2094,7 +2094,7 @@ void SpeakerSeeker3385::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 2)
+ if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor1;
@@ -2105,7 +2105,7 @@ void SpeakerSeeker3385::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4);
else
@@ -2120,7 +2120,7 @@ void SpeakerSeeker3385::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -2143,7 +2143,7 @@ void SpeakerSeeker3395::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 2)
+ if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor1;
@@ -2154,7 +2154,7 @@ void SpeakerSeeker3395::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4);
else
@@ -2169,7 +2169,7 @@ void SpeakerSeeker3395::proc15() {
if (_object2->_mover)
_object2->addMover(NULL);
}
-
+
switch (v) {
case 0:
@@ -2192,7 +2192,7 @@ void SpeakerSeeker3400::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 2)
+ if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor1;
@@ -2251,7 +2251,7 @@ void SpeakerSeeker3600::proc15() {
int v = _fieldF6;
if (!_object2) {
- if (R2_GLOBALS._player._characterIndex == 2)
+ if (R2_GLOBALS._player._characterIndex == 2)
_object2 = &R2_GLOBALS._player;
else
_object2 = &scene->_actor11;
@@ -2394,7 +2394,7 @@ void SpeakerSocko3200::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2434,7 +2434,7 @@ void SpeakerSoldier300::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2478,7 +2478,7 @@ void SpeakerTeal300::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2502,7 +2502,7 @@ void SpeakerTeal1625::proc15() {
_object1.postInit();
_object1.setPosition(Common::Point(68, 68));
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2525,7 +2525,7 @@ void SpeakerTeal3240::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2677,7 +2677,7 @@ void SpeakerTomko3245::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2729,7 +2729,7 @@ void SpeakerWebbster3240::proc15() {
_object1.postInit();
_object1.setPosition(_object2->_position);
- if (_object2->_mover)
+ if (_object2->_mover)
_object2->addMover(NULL);
}
@@ -2755,7 +2755,7 @@ void SpeakerWebbster3375::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (scene->_actor1._position.y != 163)
R2_GLOBALS._player.setStrip(8);
else
@@ -2799,7 +2799,7 @@ void SpeakerWebbster3385::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3375)
R2_GLOBALS._player.setStrip(4);
else
@@ -2843,7 +2843,7 @@ void SpeakerWebbster3395::proc15() {
_object1._numFrames = 7;
_object1._effect = 1;
_object1.changeZoom(-1);
-
+
if (R2_GLOBALS._sceneManager._previousScene == 3385)
R2_GLOBALS._player.setStrip(4);
else