diff options
author | Eugene Sandulenko | 2019-02-25 09:18:28 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2019-02-25 09:19:25 +0100 |
commit | d0a88a4b5cf39d71f1adb46d8f240a0163d981c0 (patch) | |
tree | 7a56f7dec9b193ac3c4c0c9afb1c707ab50663ce /engines/bladerunner/subtitles.h | |
parent | 9949558fdb37376554f2851d86bed11369e9d116 (diff) | |
download | scummvm-rg350-d0a88a4b5cf39d71f1adb46d8f240a0163d981c0.tar.gz scummvm-rg350-d0a88a4b5cf39d71f1adb46d8f240a0163d981c0.tar.bz2 scummvm-rg350-d0a88a4b5cf39d71f1adb46d8f240a0163d981c0.zip |
Revert "BLADERUNNER: Possible fix for broken build"
This reverts commit 727e583b94b80e299a2b6c52e67a7b99ec3558b8.
Revert "BLADERUNNER: Possible fix for clang warning for subtitles"
This reverts commit 78b14649beb833ecbc9c573e04078b626558ddc1.
Diffstat (limited to 'engines/bladerunner/subtitles.h')
-rw-r--r-- | engines/bladerunner/subtitles.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h index b1fa5ec8c0..5daf5706d3 100644 --- a/engines/bladerunner/subtitles.h +++ b/engines/bladerunner/subtitles.h @@ -49,19 +49,9 @@ class Subtitles { static const int kMaxNumOfSubtitlesLines = 3; static const int kMaxWidthPerLineToAutoSplitThresholdPx = 610; static const int kMaxTextResourceEntries = 1 + 25; // Support in-game subs (1) and all possible VQAs (25) with spoken dialogue or translatable text! + static const Common::String SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries]; + static const Common::String SUBTITLES_FONT_FILENAME_EXTERNAL; - // 'static const' declaration for SUBTITLES_FILENAME_PREFIXES (and init in cpp) causes warning: - // "declaration requires a global destructor [-Wglobal-constructors]" - // So, we declare it as a plain member should be fine, since we only use one instance of Subtitles anyway. - /* - * All supported TRE entries that can be in the SUBTITLES.MIX files need to: - * 1. Have the language code appended (after an underscore delimiter '_'). - * 2. Have the suffix extension ".TRx"; the last letter in extension "TR*" should also be the language code - * - * Important Note: If/When adding new Text Resources here --> Update kMaxTextResourceEntries - * and also check if method getIdxForSubsTreName() needs updating. - */ - const char *SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries]; BladeRunnerEngine *_vm; |