[Scummvm-cvs-logs] scummvm master -> 03b0f0949e198f332a47345584bdf6cf40795f01

Strangerke Strangerke at scummvm.org
Sun Oct 2 01:29:47 CEST 2011


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:
03b0f0949e TsAGE: Add 3 speakers used in scene 910


Commit: 03b0f0949e198f332a47345584bdf6cf40795f01
    https://github.com/scummvm/scummvm/commit/03b0f0949e198f332a47345584bdf6cf40795f01
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-10-01T16:02:25-07:00

Commit Message:
TsAGE: Add 3 speakers used in scene 910

Changed paths:
    engines/tsage/blue_force/blueforce_speakers.cpp
    engines/tsage/blue_force/blueforce_speakers.h



diff --git a/engines/tsage/blue_force/blueforce_speakers.cpp b/engines/tsage/blue_force/blueforce_speakers.cpp
index dbd7419..f54563d 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -804,6 +804,88 @@ void SpeakerGiggles::setText(const Common::String &msg) {
 	_object2.fixCountdown(8, _numFrames);
 }
 
-} // End of namespace BlueForce
+/*--------------------------------------------------------------------------*/
+
+SpeakerFBI::SpeakerFBI(): VisualSpeaker() {
+	_color1 = 27;
+	_color2 = 89;
+	
+	_speakerName = "FBI";
+}
+
+void SpeakerFBI::setText(const Common::String &msg) {
+	_removeObject2 = true;
+
+	_object2.postInit();
+	_object2.setVisage(837);
+	_object2.setStrip2(1);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 267,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerNico::SpeakerNico(): VisualSpeaker() {
+	_color1 = 105;
+	_color2 = 102;
+	
+	_speakerName = "NICO";
+}
+
+void SpeakerNico::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
+
+	_object1.postInit();
+	_object1.setVisage(905);
+	_object1.setStrip2(2);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 262,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+	
+	_object2.postInit();
+	_object2.setVisage(905);
+	_object2.setStrip2(1);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 262,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerNico::SpeakerNico(): VisualSpeaker() {
+	_color1 = 82;
+	_color2 = 80;
+	
+	_speakerName = "DA";
+}
+
+void SpeakerNico::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
 
+	_object1.postInit();
+	_object1.setVisage(915);
+	_object1.setStrip2(8);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 84,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+	
+	_object2.postInit();
+	_object2.setVisage(915);
+	_object2.setStrip2(1);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 84,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+} // End of namespace BlueForce
 } // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h
index df2a617..992cba0 100644
--- a/engines/tsage/blue_force/blueforce_speakers.h
+++ b/engines/tsage/blue_force/blueforce_speakers.h
@@ -283,6 +283,29 @@ public:
 	virtual void setText(const Common::String &msg);
 };
 
+class SpeakerFBI: public VisualSpeaker {
+public:
+	SpeakerFBI();
+
+	virtual Common::String getClassName() { return "FBI"; }
+	virtual void setText(const Common::String &msg);
+};
+		
+class SpeakerNico: public VisualSpeaker {
+public:
+	SpeakerNico();
+
+	virtual Common::String getClassName() { return "NICO"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerDA: public VisualSpeaker {
+public:
+	SpeakerDA();
+
+	virtual Common::String getClassName() { return "DA"; }
+	virtual void setText(const Common::String &msg);
+};
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE






More information about the Scummvm-git-logs mailing list