aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-11-13 20:51:30 -0500
committerPaul Gilbert2013-11-13 20:51:30 -0500
commitd23e803d75d9682f6381237264e2d401c48bafd7 (patch)
tree77821423ee719403cf56cee7c545688afbd171a8
parentd034d9271364707ee9109efa51aec146cc491c99 (diff)
downloadscummvm-rg350-d23e803d75d9682f6381237264e2d401c48bafd7.tar.gz
scummvm-rg350-d23e803d75d9682f6381237264e2d401c48bafd7.tar.bz2
scummvm-rg350-d23e803d75d9682f6381237264e2d401c48bafd7.zip
TSAGE: Fix for corrupted R2R bridge speakers. This invalidates prior scene 300 saves
-rw-r--r--engines/tsage/ringworld2/ringworld2_speakers.cpp22
-rw-r--r--engines/tsage/ringworld2/ringworld2_speakers.h4
2 files changed, 4 insertions, 22 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 49359bb351..61a4840fa5 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1844,17 +1844,8 @@ void SpeakerQuinn3700::animateSpeaker() {
// Classes related to QUINNL
//----------------------------------------------------------------------------
-SpeakerQuinnL::SpeakerQuinnL(): VisualSpeaker() {
+SpeakerQuinnL::SpeakerQuinnL(): SpeakerQuinn() {
_speakerName = "QUINNL";
- _color1 = 35;
- _color2 = 0;
- _speakerMode = 0;
- _textWidth = 300;
- _hideObjects = false;
- _object2 = NULL;
- _displayMode = 1;
- _numFrames = 0;
- _fontNumber = 10;
}
//----------------------------------------------------------------------------
@@ -2544,17 +2535,8 @@ void SpeakerSeeker3700::animateSpeaker() {
// Classes related to SEEKERL
//----------------------------------------------------------------------------
-SpeakerSeekerL::SpeakerSeekerL(): VisualSpeaker() {
+SpeakerSeekerL::SpeakerSeekerL(): SpeakerSeeker() {
_speakerName = "SEEKERL";
- _color1 = 35;
- _color2 = 0;
- _speakerMode = 0;
- _textWidth = 300;
- _hideObjects = false;
- _object2 = NULL;
- _displayMode = 1;
- _numFrames = 0;
- _fontNumber = 10;
}
//----------------------------------------------------------------------------
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 33e34ce8f6..d70652ff97 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -369,7 +369,7 @@ public:
// Classes related to QuinnL
-class SpeakerQuinnL : public VisualSpeaker {
+class SpeakerQuinnL : public SpeakerQuinn {
public:
SpeakerQuinnL();
@@ -495,7 +495,7 @@ public:
// Classes related to SeekerL
-class SpeakerSeekerL : public VisualSpeaker {
+class SpeakerSeekerL : public SpeakerSeeker {
public:
SpeakerSeekerL();