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

[dreammaster]

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:
a1cc19f916 TSAGE: Fix for Webbster speaking during R2R intro sequence


Commit: a1cc19f91667f292564664a9eb0d656ff96257c3
    https://github.com/scummvm/scummvm/commit/a1cc19f91667f292564664a9eb0d656ff96257c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-10T12:55:51-08:00

Commit Message:
TSAGE: Fix for Webbster speaking during R2R intro sequence

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b5f4081..6a438d7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1755,17 +1755,17 @@ void Scene180::signal() {
 		_teal.setPosition(Common::Point(161, 97));
 		_teal.hide();
 
-		_webbser.postInit();
-		_webbser.setPosition(Common::Point(60, 96));
-		_webbser.hide();
+		_webbster.postInit();
+		_webbster.setPosition(Common::Point(60, 96));
+		_webbster.hide();
 		_stripManager.start(11, this);
 		break;
 
 	case 33:
 		_teal.hide();
 
-		_webbser.setup(76, 4, 1);
-		_webbser.setFrame(_webbser.getFrameCount());
+		_webbster.setup(76, 4, 1);
+		_webbster.setFrame(_webbster.getFrameCount());
 
 		_shipDisplay.postInit();
 		_shipDisplay.setup(75, 1, 1);
@@ -1777,7 +1777,7 @@ void Scene180::signal() {
 
 	case 34:
 		_teal.hide();
-		_webbser.hide();
+		_webbster.hide();
 
 		_dutyOfficer.postInit();
 		_dutyOfficer.setup(76, 2, 1);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 2013b04..aa3182c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -201,7 +201,7 @@ public:
 	SpeakerDutyOfficer180 _dutyOfficerSpeaker;
 	SpeakerTeal180 _tealSpeaker;
 	SpeakerGameText _gameTextSpeaker;
-	SceneActor _dutyOfficer, _teal, _webbser, _door, _shipDisplay;
+	SceneActor _dutyOfficer, _teal, _webbster, _door, _shipDisplay;
 	ScenePalette _palette;
 	SceneText _textList[20];
 	AnimationPlayerExt _animationPlayer;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 61236ee..19f40c8 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -2943,7 +2943,7 @@ SpeakerWebbster::SpeakerWebbster(int color) {
 }
 
 void SpeakerWebbster180::proc15() {
-	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+	Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
 
@@ -2974,7 +2974,7 @@ void SpeakerWebbster180::proc15() {
 		break;
 	case 3:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(75, 6, 1);
+		_object1.setup(76, 6, 1);
 		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default: