aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/subtitles.h
diff options
context:
space:
mode:
authorantoniou792018-08-01 20:15:37 +0300
committerEugene Sandulenko2018-12-25 12:35:52 +0100
commit2f28926f22cd954c3db3e725b280339cac2a7297 (patch)
tree260a374a374d0f77bc1c5d8bc8fe9cd702ce0e1e /engines/bladerunner/subtitles.h
parent6f55071c570ee6a5bc4d4f3205972f6d7e7c35d2 (diff)
downloadscummvm-rg350-2f28926f22cd954c3db3e725b280339cac2a7297.tar.gz
scummvm-rg350-2f28926f22cd954c3db3e725b280339cac2a7297.tar.bz2
scummvm-rg350-2f28926f22cd954c3db3e725b280339cac2a7297.zip
BLADERUNNER: removed BLADERUNNER_SUBTITLES_EXTERNAL_FONT
Diffstat (limited to 'engines/bladerunner/subtitles.h')
-rw-r--r--engines/bladerunner/subtitles.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h
index 1f2465f3ee..97020f6b99 100644
--- a/engines/bladerunner/subtitles.h
+++ b/engines/bladerunner/subtitles.h
@@ -50,16 +50,15 @@ class Subtitles {
static const int kMaxWidthPerLineToAutoSplitThresholdPx = 610;
static const int kMaxTextResourceEntries = 1 + 25; // Support in-game subs (1) and all possible VQAs (26) with spoken dialogue!
static const Common::String SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries];
- static const Common::String SUBTITLES_FONT_FILENAME;
+ static const Common::String SUBTITLES_FONT_FILENAME_EXTERNAL;
+ static const Common::String SUBTITLES_FONT_FILENAME_INTERNAL;
BladeRunnerEngine *_vm;
TextResource *_vqaSubsTextResourceEntries[kMaxTextResourceEntries];
Font *_subsFont;
-#if !BLADERUNNER_SUBTITLES_EXTERNAL_FONT
Font *_subsBgFont; // needed for internal font to be used as a shadow effect and make subtitles more legible in certain situations
-#endif // BLADERUNNER_SUBTITLES_EXTERNAL_FONT
bool _isVisible;
Common::String _currentSubtitleTextFull;
@@ -70,8 +69,9 @@ class Subtitles {
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, or internal fonts (fore and background) did not load
+ bool _gameSubsResourceEntriesFound[kMaxTextResourceEntries]; // false if a TRE file did not open successfully
+ bool _subsFontsExternal; // true if we are using the external font, false otherwise
+ bool _subsFontsLoaded; // false if external fonts and internal fonts (fore and background) did not load
bool _subtitlesSystemInactive; // true if the whole subtitles subsystem should be disabled (due to missing required resources)
public: