[Scummvm-cvs-logs] scummvm master -> 931f8979d4d91b24288dbd747251d4d82f4f6609
Strangerke
Strangerke at scummvm.org
Wed Sep 28 01:30:10 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
446b9b1dbd TSAGE: Add two speakers used in scene 710
931f8979d4 CGE: Fix a couple of scene types
Commit: 446b9b1dbd109c830f14ac8b28dc12cdf93d546d
https://github.com/scummvm/scummvm/commit/446b9b1dbd109c830f14ac8b28dc12cdf93d546d
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-09-27T16:22:18-07:00
Commit Message:
TSAGE: Add two speakers used in scene 710
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 a75746b..31e1835 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -201,6 +201,35 @@ void SpeakerHarrison::setText(const Common::String &msg) {
/*--------------------------------------------------------------------------*/
+SpeakerJake::SpeakerJake(): VisualSpeaker() {
+ _color1 = 13;
+ _color2 = 7;
+ _speakerName = "JAKE";
+}
+
+void SpeakerJake::setText(const Common::String &msg) {
+ _removeObject1 = _removeObject2 = true;
+
+ _object1.postInit();
+ _object1.setVisage(1001);
+ _object1.setStrip2(2);
+ _object1.fixPriority(254);
+ _object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 38,
+ BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+ _object2.postInit();
+ _object2.setVisage(1001);
+ _object2.setStrip2(1);
+ _object2.fixPriority(255);
+ _object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 38,
+ BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+ VisualSpeaker::setText(msg);
+ _object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
SpeakerJakeJacket::SpeakerJakeJacket(): VisualSpeaker() {
_color1 = 13;
_color2 = 7;
@@ -391,6 +420,35 @@ void SpeakerJordan::setText(const Common::String &msg) {
/*--------------------------------------------------------------------------*/
+SpeakerSkip::SpeakerSkip(): VisualSpeaker() {
+ _color1 = 80;
+ _color2 = 82;
+ _speakerName = "SKIP";
+}
+
+void SpeakerSkip::setText(const Common::String &msg) {
+ _removeObject1 = _removeObject2 = true;
+
+ _object1.postInit();
+ _object1.setVisage(345);
+ _object1.setStrip2(4);
+ _object1.fixPriority(254);
+ _object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 282,
+ BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+ _object2.postInit();
+ _object2.setVisage(345);
+ _object2.setStrip2(1);
+ _object2.fixPriority(255);
+ _object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 282,
+ BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+ VisualSpeaker::setText(msg);
+ _object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
SpeakerSkipB::SpeakerSkipB(): VisualSpeaker() {
_color1 = 80;
_color2 = 82;
diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h
index 3e6728c..f106ef9 100644
--- a/engines/tsage/blue_force/blueforce_speakers.h
+++ b/engines/tsage/blue_force/blueforce_speakers.h
@@ -92,6 +92,14 @@ public:
virtual void setText(const Common::String &msg);
};
+class SpeakerJake: public VisualSpeaker {
+public:
+ SpeakerJake();
+
+ virtual Common::String getClassName() { return "SpeakerJake"; }
+ virtual void setText(const Common::String &msg);
+};
+
class SpeakerJakeJacket: public VisualSpeaker {
public:
SpeakerJakeJacket();
@@ -155,6 +163,14 @@ public:
virtual void setText(const Common::String &msg);
};
+class SpeakerSkip: public VisualSpeaker {
+public:
+ SpeakerSkip();
+
+ virtual Common::String getClassName() { return "SpeakerSkip"; }
+ virtual void setText(const Common::String &msg);
+};
+
class SpeakerSkipB: public VisualSpeaker {
public:
SpeakerSkipB();
Commit: 931f8979d4d91b24288dbd747251d4d82f4f6609
https://github.com/scummvm/scummvm/commit/931f8979d4d91b24288dbd747251d4d82f4f6609
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-09-27T16:23:13-07:00
Commit Message:
CGE: Fix a couple of scene types
Changed paths:
engines/tsage/blue_force/blueforce_scenes9.cpp
engines/tsage/blue_force/blueforce_scenes9.h
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index 7a6ac99..0768f76 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -1207,7 +1207,7 @@ void Scene940::Action1::signal() {
}
void Scene940::postInit(SceneObjectList *OwnerList) {
- PalettedScene::postInit();
+ SceneExt::postInit();
loadScene(940);
BF_GLOBALS._sound1.play(115);
diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h
index d4eba60..b8d855c 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.h
+++ b/engines/tsage/blue_force/blueforce_scenes9.h
@@ -121,7 +121,7 @@ public:
void synchronize(Serializer &s);
};
-class Scene920: public PalettedScene {
+class Scene920: public SceneExt {
/* Items */
class Item1: public NamedHotspot {
public:
@@ -179,7 +179,7 @@ public:
void dispatch();
};
-class Scene940: public PalettedScene {
+class Scene940: public SceneExt {
/* Items */
class Item1: public NamedHotspot {
public:
More information about the Scummvm-git-logs
mailing list