[Scummvm-cvs-logs] scummvm master -> d23e803d75d9682f6381237264e2d401c48bafd7

dreammaster dreammaster at scummvm.org
Thu Nov 14 02:52:09 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d23e803d75 TSAGE: Fix for corrupted R2R bridge speakers. This invalidates prior scene 300 saves


Commit: d23e803d75d9682f6381237264e2d401c48bafd7
    https://github.com/scummvm/scummvm/commit/d23e803d75d9682f6381237264e2d401c48bafd7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-13T17:51:30-08:00

Commit Message:
TSAGE: Fix for corrupted R2R bridge speakers. This invalidates prior scene 300 saves

Changed paths:
    engines/tsage/ringworld2/ringworld2_speakers.cpp
    engines/tsage/ringworld2/ringworld2_speakers.h



diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 49359bb..61a4840 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 33e34ce..d70652f 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();
 






More information about the Scummvm-git-logs mailing list