aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstrangerke2011-05-06 08:39:22 +0200
committerstrangerke2011-05-06 08:39:22 +0200
commitbe3de84f7c9229cf4fb3381f24fff5b3f234e3ce (patch)
treef92542e639e64eeaab819a54714630afc8171b8a
parent44ad7d45baa628e59105ecf3a1977b369b40c395 (diff)
downloadscummvm-rg350-be3de84f7c9229cf4fb3381f24fff5b3f234e3ce.tar.gz
scummvm-rg350-be3de84f7c9229cf4fb3381f24fff5b3f234e3ce.tar.bz2
scummvm-rg350-be3de84f7c9229cf4fb3381f24fff5b3f234e3ce.zip
TSAGE: Review all Speakers
-rw-r--r--engines/tsage/ringworld_logic.cpp49
-rw-r--r--engines/tsage/ringworld_logic.h1
2 files changed, 32 insertions, 18 deletions
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index b22996e916..4321c53c47 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -396,18 +396,18 @@ void SpeakerPOR::setText(const Common::String &msg) {
_object1.postInit(&_objectList);
_object1.setVisage(7223);
_object1.setStrip2(2);
- _object1.setPosition(Common::Point(191, 166), 0);
- _object1.animate(ANIM_MODE_7, 0, 0);
+ _object1.setPosition(Common::Point(191, 166));
+ _object1.animate(ANIM_MODE_7, 0, NULL);
_object2.postInit(&_objectList);
_object2.setVisage(7223);
- _object2.setPosition(Common::Point(159, 86), 0);
- _object2.setAction(&_speakerAction, 0);
+ _object2.setPosition(Common::Point(159, 86));
+ _object2.setAction(&_speakerAction, NULL);
_object3.postInit(&_objectList);
_object3.setVisage(7223);
_object3.setStrip(3);
- _object3.setPosition(Common::Point(119, 107), 0);
+ _object3.setPosition(Common::Point(119, 107));
_object3.fixPriority(199);
_object3.setAction(&_action2);
@@ -431,8 +431,8 @@ void SpeakerOR::setText(const Common::String &msg) {
_object1.fixPriority(255);
_object1.changeZoom(100);
_object1._frame = 1;
- _object1.setPosition(Common::Point(202, 147), 0);
- _object1.animate(ANIM_MODE_7, 0, 0);
+ _object1.setPosition(Common::Point(202, 147));
+ _object1.animate(ANIM_MODE_7, 0, NULL);
_object2.postInit(&_objectList);
_object2.setVisage(9431);
@@ -440,8 +440,8 @@ void SpeakerOR::setText(const Common::String &msg) {
_object2.fixPriority(255);
_object2.setZoom(100);
_object2._frame = 1;
- _object2.setPosition(Common::Point(199, 85), 0);
- _object2.setAction(&_speakerAction, 0);
+ _object2.setPosition(Common::Point(199, 85));
+ _object2.setAction(&_speakerAction, NULL);
Speaker::setText(msg);
}
@@ -518,7 +518,7 @@ SpeakerEText::SpeakerEText() {
/*--------------------------------------------------------------------------*/
-SpeakerGR::SpeakerGR() {
+SpeakerGR::SpeakerGR() : AnimatedSpeaker() {
_speakerName = "GR";
_newSceneNumber = 9220;
_textWidth = 136;
@@ -526,6 +526,19 @@ SpeakerGR::SpeakerGR() {
_color1 = 14;
}
+void SpeakerGR::setText(const Common::String &msg) {
+ _object1.postInit(&_objectList);
+ _object1.setVisage(9221);
+ _object1.setStrip2(2);
+ _object1.fixPriority(255);
+ _object1.changeZoom(100);
+ _object1._frame = 1;
+ _object1.setPosition(Common::Point(101, 70));
+ _object1.animate(ANIM_MODE_7, 0, NULL);
+
+ Speaker::setText(msg);
+}
+
/*--------------------------------------------------------------------------*/
SpeakerHText::SpeakerHText() {
@@ -541,7 +554,7 @@ SpeakerSKText::SpeakerSKText() : ScreenSpeaker() {
_speakerName = "SKTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTER;
- _color1 = 5;
+ _color1 = 9;
_hideObjects = false;
}
@@ -600,16 +613,16 @@ SpeakerSKL::SpeakerSKL() : AnimatedSpeaker() {
_speakerName = "SKL";
_newSceneNumber = 7011;
_textPos = Common::Point(10, 30);
- _color1 = 10;
+ _color1 = 9;
}
void SpeakerSKL::setText(const Common::String &msg) {
_object1.postInit(&_objectList);
_object1.setVisage(7013);
_object1.setStrip2(2);
- _object1._frame = 1;
_object1.fixPriority(255);
_object1.changeZoom(100);
+ _object1._frame = 1;
_object1.setPosition(Common::Point(203, 120));
_object1.animate(ANIM_MODE_7, 0, NULL);
@@ -780,8 +793,8 @@ void SpeakerQU::setText(const Common::String &msg) {
_object1.fixPriority(255);
_object1.changeZoom(100);
_object1._frame = 1;
- _object1.setPosition(Common::Point(116, 120), 0);
- _object1.animate(ANIM_MODE_7, 0, 0);
+ _object1.setPosition(Common::Point(116, 120));
+ _object1.animate(ANIM_MODE_7, 0, NULL);
_object2.postInit(&_objectList);
_object2.setVisage(7021);
@@ -789,8 +802,8 @@ void SpeakerQU::setText(const Common::String &msg) {
_object2.fixPriority(255);
_object2.changeZoom(100);
_object2._frame = 1;
- _object2.setPosition(Common::Point(111, 84), 0);
- _object2.setAction(&_speakerAction, 0);
+ _object2.setPosition(Common::Point(111, 84));
+ _object2.setAction(&_speakerAction, NULL);
Speaker::setText(msg);
}
@@ -877,6 +890,7 @@ void SpeakerSAL::setText(const Common::String &msg) {
_object2.setVisage(2853);
_object2.setStrip2(1);
_object2.fixPriority(255);
+ _object2.changeZoom(100);
_object2._frame = 1;
_object2.setPosition(Common::Point(170, 92));
_object2.setAction(&_speakerAction, NULL);
@@ -980,7 +994,6 @@ void SpeakerCHFR::setText(const Common::String &msg) {
/*--------------------------------------------------------------------------*/
SpeakerPL::SpeakerPL() {
- // TODO: check initialization of object3 and action2
_speakerName = "PL";
_newSceneNumber = 4060;
_textPos = Common::Point(160, 40);
diff --git a/engines/tsage/ringworld_logic.h b/engines/tsage/ringworld_logic.h
index d790631f2f..e84779e6ad 100644
--- a/engines/tsage/ringworld_logic.h
+++ b/engines/tsage/ringworld_logic.h
@@ -192,6 +192,7 @@ public:
SpeakerGR();
virtual Common::String getClassName() { return "SpeakerGR"; }
+ virtual void setText(const Common::String &msg);
};
class SpeakerHText : public ScreenSpeaker {