XEEN: Refactoring subtitles for use in location cutscenes, updated Reaper cutscene

1 files changed, 8 insertions, 13 deletions

diff --git a/engines/xeen/subtitles.h b/engines/xeen/subtitles.h
index 84f7a09d15..37148dbc92 100644
--- a/engines/xeen/subtitles.h
+++ b/engines/xeen/subtitles.h
@@ -29,17 +29,17 @@
 namespace Xeen {
 
 class Subtitles {
-protected:
+private:
 	Common::StringArray _lines;
 	int _lineNum;
 	SpriteResource *_boxSprites;
 	int _lineEnd, _lineSize;
 	Common::String _displayLine;
-protected:
+private:
 	/**
 	 * Loads the string list of all subtitles
 	 */
-	virtual void loadSubtitles();
+	void loadSubtitles();
 
 	/**
 	 * Mark the current time
@@ -77,6 +77,11 @@ public:
 	bool active() const;
 
 	/**
+	 * Returns true if a subtitle is active or a voice line is currently being played
+	 */
+	bool lineActive() const;
+
+	/**
 	 * Shows any active subtitle
 	 */
 	void show();
@@ -95,16 +100,6 @@ public:
 	bool waitForLineOrSound();
 };
 
-class CloudsSubtitles : public Subtitles {
-protected:
-	/**
-	 * Loads the string list of all subtitles
-	 */
-	virtual void loadSubtitles();
-public:
-	CloudsSubtitles() : Subtitles() {}
-};
-
 } // End of namespace Xeen
 
 #endif /* XEEN_SUBTITLES_H */