BLADERUNNER: Clean-up for subtitles initialization code

1 files changed, 18 insertions, 17 deletions

diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h
index 2947ab5645..0a3ec820c8 100644
--- a/engines/bladerunner/subtitles.h
+++ b/engines/bladerunner/subtitles.h
@@ -57,33 +57,34 @@ class Subtitles {
 
 	BladeRunnerEngine *_vm;
 
-	TextResource    *_vqaSubsTextResourceEntries[kMaxTextResourceEntries];
-	Font            *_subsFont;
-
-	bool				_isVisible;
-	bool				_forceShowWhenNoSpeech;
-	Common::String		_currentSubtitleTextFull;
-	Common::String		_subtitleLineQuote[kMaxNumOfSubtitlesLines];
-	int _subtitleLineScreenY[kMaxNumOfSubtitlesLines];
-	int _subtitleLineScreenX[kMaxNumOfSubtitlesLines];
-	int _subtitleLineSplitAtCharIndex[kMaxNumOfSubtitlesLines];
-	int _currentSubtitleLines;
-	bool _subtitlesQuoteChanged;
+	TextResource *_vqaSubsTextResourceEntries[kMaxTextResourceEntries];
+	Font         *_subsFont;
+
+	bool           _isVisible;
+	bool           _forceShowWhenNoSpeech;
+	Common::String _currentSubtitleTextFull;
+	Common::String _subtitleLineQuote[kMaxNumOfSubtitlesLines];
+	int            _subtitleLineScreenY[kMaxNumOfSubtitlesLines];
+	int            _subtitleLineScreenX[kMaxNumOfSubtitlesLines];
+	int            _subtitleLineSplitAtCharIndex[kMaxNumOfSubtitlesLines];
+	int            _currentSubtitleLines;
+	bool           _subtitlesQuoteChanged;
 
 	bool _gameSubsResourceEntriesFound[kMaxTextResourceEntries];	// false if a TRE file did not open successfully
 	bool _subsFontsLoaded;											// false if external fonts did not load
-	bool _subtitlesSystemInactive;									// true if the whole subtitles subsystem should be disabled (due to missing required resources)
+	bool _subtitlesSystemActive;									// true if the whole subtitles subsystem should be disabled (due to missing required resources)
 
 public:
 	Subtitles(BladeRunnerEngine *vm);
 	~Subtitles();
 
+	bool isSystemActive() const { return _subtitlesSystemActive; }
+
 	void init();
-	void setSubtitlesSystemInactive(bool flag);                     // disable subtitles system (possibly due to missing important resources like SUBTITLES.MIX file)
-	const char *getInGameSubsText(int actorId, int speech_id) ;     // get the text for actorId, quoteId (in-game subs)
-	const char *getOuttakeSubsText(const Common::String &outtakesName, int frame);  // get the text for this frame if any
+	const char *getInGameSubsText(int actorId, int speech_id);						// get the text for actorId, quoteId (in-game subs)
+	const char *getOuttakeSubsText(const Common::String &outtakesName, int frame);	// get the text for this frame if any
 
-	void setGameSubsText(Common::String dbgQuote, bool force);                  // for debugging - explicit set subs text
+	void setGameSubsText(Common::String dbgQuote, bool force);	// for debugging - explicit set subs text
 	bool show();
 	bool hide();
 	bool isVisible() const;