aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThanasis Antoniou2019-02-25 00:05:01 +0200
committerThanasis Antoniou2019-02-25 00:05:01 +0200
commit727e583b94b80e299a2b6c52e67a7b99ec3558b8 (patch)
tree29502b30cfaa562e82eb0ee9a72652030d96ac00
parent78b14649beb833ecbc9c573e04078b626558ddc1 (diff)
downloadscummvm-rg350-727e583b94b80e299a2b6c52e67a7b99ec3558b8.tar.gz
scummvm-rg350-727e583b94b80e299a2b6c52e67a7b99ec3558b8.tar.bz2
scummvm-rg350-727e583b94b80e299a2b6c52e67a7b99ec3558b8.zip
BLADERUNNER: Possible fix for broken build
Previous fix attempt for the clang warning "warning: declaration requires a global destructor [-Wglobal-constructors]" went awry
-rw-r--r--engines/bladerunner/subtitles.cpp27
-rw-r--r--engines/bladerunner/subtitles.h29
2 files changed, 28 insertions, 28 deletions
diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index 3a21625080..597f0d9c29 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -63,6 +63,33 @@ namespace BladeRunner {
Subtitles::Subtitles(BladeRunnerEngine *vm) {
_vm = vm;
_subtitlesSystemInactive = false;
+ //
+ SUBTITLES_FILENAME_PREFIXES[0] = "INGQUO"; // 0 // (in-game subtitles, not VQA subtitles)
+ SUBTITLES_FILENAME_PREFIXES[1] = "WSTLGO"; // 1 // all game (language) versions have the English ('E') version of WSTLGO
+ SUBTITLES_FILENAME_PREFIXES[2] = "BRLOGO"; // 2 // all game (language) versions have the English ('E') version of BRLOGO
+ SUBTITLES_FILENAME_PREFIXES[3] = "INTRO"; // 3
+ SUBTITLES_FILENAME_PREFIXES[4] = "MW_A"; // 4
+ SUBTITLES_FILENAME_PREFIXES[5] = "MW_B01"; // 5
+ SUBTITLES_FILENAME_PREFIXES[6] = "MW_B02"; // 6
+ SUBTITLES_FILENAME_PREFIXES[7] = "MW_B03"; // 7
+ SUBTITLES_FILENAME_PREFIXES[8] = "MW_B04"; // 8
+ SUBTITLES_FILENAME_PREFIXES[9] = "MW_B05"; // 9
+ SUBTITLES_FILENAME_PREFIXES[10] = "INTRGT"; // 10
+ SUBTITLES_FILENAME_PREFIXES[11] = "MW_C01"; // 11
+ SUBTITLES_FILENAME_PREFIXES[12] = "MW_C02"; // 12
+ SUBTITLES_FILENAME_PREFIXES[13] = "MW_C03"; // 13
+ SUBTITLES_FILENAME_PREFIXES[14] = "MW_D"; // 14
+ SUBTITLES_FILENAME_PREFIXES[15] = "END04A"; // 15
+ SUBTITLES_FILENAME_PREFIXES[16] = "END04B"; // 16
+ SUBTITLES_FILENAME_PREFIXES[17] = "END04C"; // 17
+ SUBTITLES_FILENAME_PREFIXES[18] = "END06"; // 18
+ SUBTITLES_FILENAME_PREFIXES[19] = "END01A"; // 19
+ SUBTITLES_FILENAME_PREFIXES[20] = "END01B"; // 20
+ SUBTITLES_FILENAME_PREFIXES[21] = "END01C"; // 21
+ SUBTITLES_FILENAME_PREFIXES[22] = "END01D"; // 22
+ SUBTITLES_FILENAME_PREFIXES[23] = "END01E"; // 23
+ SUBTITLES_FILENAME_PREFIXES[24] = "END01F"; // 24
+ SUBTITLES_FILENAME_PREFIXES[25] = "END03"; // 25
// Initializing and reseting Subtitles
for (int i = 0; i < kMaxTextResourceEntries; i++) {
_vqaSubsTextResourceEntries[i] = nullptr;
diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h
index f43d688c18..b1fa5ec8c0 100644
--- a/engines/bladerunner/subtitles.h
+++ b/engines/bladerunner/subtitles.h
@@ -61,34 +61,7 @@ class Subtitles {
* 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]{
- "INGQUO", // 0 // (in-game subtitles, not VQA subtitles)
- "WSTLGO", // 1 // all game (language) versions have the English ('E') version of WSTLGO
- "BRLOGO", // 2 // all game (language) versions have the English ('E') version of BRLOGO
- "INTRO", // 3
- "MW_A", // 4
- "MW_B01", // 5
- "MW_B02", // 6
- "MW_B03", // 7
- "MW_B04", // 8
- "MW_B05", // 9
- "INTRGT", // 10
- "MW_C01", // 11
- "MW_C02", // 12
- "MW_C03", // 13
- "MW_D", // 14
- "END04A", // 15
- "END04B", // 16
- "END04C", // 17
- "END06", // 18
- "END01A", // 19
- "END01B", // 20
- "END01C", // 21
- "END01D", // 22
- "END01E", // 23
- "END01F", // 24
- "END03" // 25
- };
+ const char *SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries];
BladeRunnerEngine *_vm;