From 88e68abd4b0e2b8430395cc0ad87dac45ef974c6 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 8 Sep 2011 20:40:23 +1000 Subject: TSAGE: Separated speaker classes for both games into separate files --- engines/tsage/blue_force/blueforce_speakers.h | 123 ++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 engines/tsage/blue_force/blueforce_speakers.h (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h new file mode 100644 index 0000000000..9db0dd2126 --- /dev/null +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -0,0 +1,123 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TSAGE_BLUEFORCE_SPEAKERS_H +#define TSAGE_BLUEFORCE_SPEAKERS_H + +#include "common/scummsys.h" +#include "tsage/converse.h" +#include "tsage/events.h" +#include "tsage/core.h" +#include "tsage/scenes.h" +#include "tsage/globals.h" +#include "tsage/blue_force/blueforce_logic.h" + +namespace TsAGE { + +namespace BlueForce { + +using namespace TsAGE; + +class VisualSpeaker: public Speaker { +public: + NamedObject _object1; + CountdownObject _object2; + bool _removeObject1, _removeObject2; + int _xp; + int _numFrames; + Common::Point _offsetPos; +public: + VisualSpeaker(); + + virtual Common::String getClassName() { return "VisualSpeaker"; } + virtual void synchronize(Serializer &s); + virtual void remove(); + virtual void proc12(Action *action); + virtual void setText(const Common::String &msg); +}; + +class SpeakerGameText: public VisualSpeaker { +public: + SpeakerGameText(); + + virtual Common::String getClassName() { return "SpeakerGameText"; } +}; + +class SpeakerSutter: public VisualSpeaker { +public: + SpeakerSutter(); + + virtual Common::String getClassName() { return "SpeakerSutter"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerDoug: public VisualSpeaker { +public: + SpeakerDoug(); + + virtual Common::String getClassName() { return "SpeakerDoug"; } +}; + +class SpeakerJakeNoHead: public VisualSpeaker { +public: + SpeakerJakeNoHead(); + + virtual Common::String getClassName() { return "SpeakerJakeNoHead"; } +}; + +class SpeakerHarrison: public VisualSpeaker { +public: + SpeakerHarrison(); + + virtual Common::String getClassName() { return "SpeakerHarrison"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerJakeJacket: public VisualSpeaker { +public: + SpeakerJakeJacket(); + + virtual Common::String getClassName() { return "SpeakerJakeJacket"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerJakeUniform: public VisualSpeaker { +public: + SpeakerJakeUniform(); + + virtual Common::String getClassName() { return "SpeakerJakeUniform"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerJailer: public VisualSpeaker { +public: + SpeakerJailer(); + + virtual Common::String getClassName() { return "SpeakerJailer"; } + virtual void setText(const Common::String &msg); +}; + +} // End of namespace BlueForce + +} // End of namespace TsAGE + +#endif -- cgit v1.2.3 From c75da8051cd81548d112201c347c422fa570ea0b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 10 Sep 2011 11:21:57 +1000 Subject: TSAGE: Implemented Scene 325 - Police Conference Room --- engines/tsage/blue_force/blueforce_speakers.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 9db0dd2126..1bb56ece96 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -116,6 +116,15 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerPSutter: public VisualSpeaker { +public: + SpeakerPSutter(); + + virtual Common::String getClassName() { return "SpeakerPSutter"; } + virtual void setText(const Common::String &msg); +}; + + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From 406a8ca10e000fcad82f9349f944ecf51adbc0cd Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 11 Sep 2011 15:30:34 +1000 Subject: TSAGE: Reworked item startAction calls from void to bool, to accommodate Blue Force changes --- engines/tsage/blue_force/blueforce_speakers.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 1bb56ece96..c05938506a 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -124,6 +124,13 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerJakeRadio: public VisualSpeaker { +public: + SpeakerJakeRadio(); + + virtual Common::String getClassName() { return "SpeakerJakeRadio"; } +}; + } // End of namespace BlueForce -- cgit v1.2.3 From 0c2dfd2efca1bee7babf9c6acadaca052e1aae25 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 12 Sep 2011 21:51:22 +1000 Subject: TSAGE: Implemented Scene 800 - Jamison & Ryan --- engines/tsage/blue_force/blueforce_speakers.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index c05938506a..12eb97ce6c 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -131,6 +131,13 @@ public: virtual Common::String getClassName() { return "SpeakerJakeRadio"; } }; +class SpeakerLyleHat: public VisualSpeaker { +public: + SpeakerLyleHat(); + + virtual Common::String getClassName() { return "SpeakerLyleHat"; } + virtual void setText(const Common::String &msg); +}; } // End of namespace BlueForce -- cgit v1.2.3 From b141018f8d92ecbf2faac7159ef8378eabf2321a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 15 Sep 2011 13:43:14 +1000 Subject: TSAGE: Implemented Blue Force scene 340 - Marina, Domestic Disturbance --- engines/tsage/blue_force/blueforce_speakers.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 12eb97ce6c..56832a2ee8 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -139,6 +139,23 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerJordan: public VisualSpeaker { +public: + SpeakerJordan(); + + virtual Common::String getClassName() { return "SpeakerJordan"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerSkipB: public VisualSpeaker { +public: + SpeakerSkipB(); + + virtual Common::String getClassName() { return "SpeakerSkipB"; } + virtual void setText(const Common::String &msg); +}; + + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From e506df40ce78b982362fcd7aadd26c987f3255c5 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 16 Sep 2011 17:30:39 +1000 Subject: TSAGE: Implemented Blue Force scene 840 - Boat Rentals --- engines/tsage/blue_force/blueforce_speakers.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 56832a2ee8..37b8050ef0 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -155,6 +155,13 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerCarter: public VisualSpeaker { +public: + SpeakerCarter(); + + virtual Common::String getClassName() { return "SpeakerCarter"; } + virtual void setText(const Common::String &msg); +}; } // End of namespace BlueForce -- cgit v1.2.3 From fba3fc360221670bc9a2209f7b994273141721a5 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 17 Sep 2011 17:41:12 +1000 Subject: TSAGE: Implemented Blue Force scene 385 - City Hall --- engines/tsage/blue_force/blueforce_speakers.h | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 37b8050ef0..dd902a0ebe 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -163,6 +163,46 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerDriver: public VisualSpeaker { +public: + SpeakerDriver(); + + virtual Common::String getClassName() { return "SpeakerDriver"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerShooter: public VisualSpeaker { +public: + SpeakerShooter(); + + virtual Common::String getClassName() { return "SpeakerShooter"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerJim: public VisualSpeaker { +public: + SpeakerJim(); + + virtual Common::String getClassName() { return "SpeakerJim"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerDezi: public VisualSpeaker { +public: + SpeakerDezi(); + + virtual Common::String getClassName() { return "SpeakerDezi"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerJake385: public VisualSpeaker { +public: + SpeakerJake385(); + + virtual Common::String getClassName() { return "SpeakerJake385"; } + virtual void setText(const Common::String &msg); +}; + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From 413a48bbe3ef6110a6f36f360a9ab92b0ce46cf0 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 17 Sep 2011 21:37:02 +1000 Subject: TSAGE: Implemented Blue Force scene 390 - City Jail --- engines/tsage/blue_force/blueforce_speakers.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index dd902a0ebe..d5a38f86c1 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -116,6 +116,14 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerGreen: public VisualSpeaker { +public: + SpeakerGreen(); + + virtual Common::String getClassName() { return "SpeakerGreen"; } + virtual void setText(const Common::String &msg); +}; + class SpeakerPSutter: public VisualSpeaker { public: SpeakerPSutter(); -- cgit v1.2.3 From 95467a379c6b929d55f9f4d6389e0ae715ff9087 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 18 Sep 2011 15:56:07 +1000 Subject: TSAGE: Implemented Blue Force scene 370 - Future Wave bedroom --- engines/tsage/blue_force/blueforce_speakers.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index d5a38f86c1..3e6728c771 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -211,6 +211,22 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerLaura: public VisualSpeaker { +public: + SpeakerLaura(); + + virtual Common::String getClassName() { return "SpeakerLaura"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerLauraHeld: public VisualSpeaker { +public: + SpeakerLauraHeld(); + + virtual Common::String getClassName() { return "SpeakerLaura"; } + virtual void setText(const Common::String &msg); +}; + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From 446b9b1dbd109c830f14ac8b28dc12cdf93d546d Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 28 Sep 2011 01:21:36 +0200 Subject: TSAGE: Add two speakers used in scene 710 --- engines/tsage/blue_force/blueforce_speakers.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 3e6728c771..f106ef926c 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(); -- cgit v1.2.3 From 10f0ea4306be2b274a79cc16a406536c36662d88 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 28 Sep 2011 20:04:58 +1000 Subject: TSAGE: Implemented Blue Force scene 450 --- engines/tsage/blue_force/blueforce_speakers.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index f106ef926c..9eb3106efc 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -243,6 +243,31 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerEugene: public VisualSpeaker { +public: + SpeakerEugene(); + + virtual Common::String getClassName() { return "SpeakerEugene"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerWeasel: public VisualSpeaker { +public: + SpeakerWeasel(); + + virtual Common::String getClassName() { return "SpeakerWeasel"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerBilly: public VisualSpeaker { +public: + SpeakerBilly(); + + virtual Common::String getClassName() { return "SpeakerBilly"; } + virtual void setText(const Common::String &msg); +}; + + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From a7f26eb1591dcd50f7ce4ee8485eca6fbbd9a145 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 30 Sep 2011 20:26:47 +1000 Subject: TSAGE: Implemented Blue Force scene 551 - Outside Bikini Hut (Drunk Stop) --- engines/tsage/blue_force/blueforce_speakers.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 9eb3106efc..df2a617941 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -267,6 +267,21 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerDrunk: public VisualSpeaker { +public: + SpeakerDrunk(); + + virtual Common::String getClassName() { return "SpeakerDrunk"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerGiggles: public VisualSpeaker { +public: + SpeakerGiggles(); + + virtual Common::String getClassName() { return "SpeakerGiggles"; } + virtual void setText(const Common::String &msg); +}; } // End of namespace BlueForce -- cgit v1.2.3 From 03b0f0949e198f332a47345584bdf6cf40795f01 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 2 Oct 2011 01:01:31 +0200 Subject: TsAGE: Add 3 speakers used in scene 910 --- engines/tsage/blue_force/blueforce_speakers.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index df2a617941..992cba0e2d 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 -- cgit v1.2.3 From 80ddd7abe83174a4129e398ed73ebaf5dd920d6e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 4 Oct 2011 23:04:09 +1100 Subject: TSAGE: Implemented Blue Force scene 270 - Grandma's Living Room --- engines/tsage/blue_force/blueforce_speakers.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index 992cba0e2d..d25c10b728 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -306,6 +306,23 @@ public: virtual Common::String getClassName() { return "DA"; } virtual void setText(const Common::String &msg); }; + +class SpeakerGrandma: public VisualSpeaker { +public: + SpeakerGrandma(); + + virtual Common::String getClassName() { return "SpeakerGrandma"; } + virtual void setText(const Common::String &msg); +}; + +class SpeakerLyle: public VisualSpeaker { +public: + SpeakerLyle(); + + virtual Common::String getClassName() { return "SpeakerLyle"; } + virtual void setText(const Common::String &msg); +}; + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3 From 964ac1fad6f7ae880a3abe403a3aedf9235139a0 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 6 Oct 2011 23:09:23 +1100 Subject: TSAGE: Implemented Blue Force scene 271 - Living Room/Kitchen #2 --- engines/tsage/blue_force/blueforce_speakers.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'engines/tsage/blue_force/blueforce_speakers.h') diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h index d25c10b728..932c3c311f 100644 --- a/engines/tsage/blue_force/blueforce_speakers.h +++ b/engines/tsage/blue_force/blueforce_speakers.h @@ -323,6 +323,20 @@ public: virtual void setText(const Common::String &msg); }; +class SpeakerGranText: public VisualSpeaker { +public: + SpeakerGranText(); + + virtual Common::String getClassName() { return "SpeakerGranText"; } +}; + +class SpeakerLyleText: public VisualSpeaker { +public: + SpeakerLyleText(); + + virtual Common::String getClassName() { return "SpeakerLyleText"; } +}; + } // End of namespace BlueForce } // End of namespace TsAGE -- cgit v1.2.3