[Scummvm-git-logs] scummvm master -> 9d23fa61ccf2c409e531aaac31e71b418bcd67e3
eriktorbjorn
noreply at scummvm.org
Thu Nov 7 19:17:18 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9d23fa61cc SCUMM: MACGUI: Silence Clang warning
Commit: 9d23fa61ccf2c409e531aaac31e71b418bcd67e3
https://github.com/scummvm/scummvm/commit/9d23fa61ccf2c409e531aaac31e71b418bcd67e3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-11-07T20:15:32+01:00
Commit Message:
SCUMM: MACGUI: Silence Clang warning
Apparently using Common::String for the parsing method triggers Clang's
"this needs a global destructor" warning. Changing it to an enum takes
care of that, even if the syntax gets a little bit more unwieldy.
Changed paths:
engines/scumm/macgui/macgui_impl.h
engines/scumm/macgui/macgui_strings.cpp
diff --git a/engines/scumm/macgui/macgui_impl.h b/engines/scumm/macgui/macgui_impl.h
index b143edba442..6d439573878 100644
--- a/engines/scumm/macgui/macgui_impl.h
+++ b/engines/scumm/macgui/macgui_impl.h
@@ -108,9 +108,14 @@ public:
kMSIAboutString40
};
+ enum ParsingMethod {
+ kStrC,
+ kStrPascal,
+ };
+
struct MacSTRSParsingEntry {
MacStringIds strId;
- Common::String parsingMethod;
+ ParsingMethod parsingMethod;
int numStrings;
};
diff --git a/engines/scumm/macgui/macgui_strings.cpp b/engines/scumm/macgui/macgui_strings.cpp
index 7d175543954..8d435348cf9 100644
--- a/engines/scumm/macgui/macgui_strings.cpp
+++ b/engines/scumm/macgui/macgui_strings.cpp
@@ -50,61 +50,61 @@ Common::String MacGuiImpl::readPascalString(uint8 *&data) {
return result;
}
-#define SKIP_C(x) { MacGuiImpl::kMSISkip, "C", x }
-#define SKIP_P(x) { MacGuiImpl::kMSISkip, "Pascal", x }
+#define SKIP_C(x) { MacGuiImpl::kMSISkip, MacGuiImpl::kStrC, x }
+#define SKIP_P(x) { MacGuiImpl::kMSISkip, MacGuiImpl::kStrPascal, x }
static MacGuiImpl::MacSTRSParsingEntry strsIndy3Table[] = {
SKIP_C(6),
SKIP_P(2),
SKIP_C(2),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_P(2),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
SKIP_P(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(2),
SKIP_C(2),
SKIP_P(1),
SKIP_C(67),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "C", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
// SKIP_C(1),
// SKIP_P(4),
// SKIP_C(3),
@@ -120,49 +120,49 @@ static MacGuiImpl::MacSTRSParsingEntry strsLoomTable[] = {
SKIP_P(2),
SKIP_C(2),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_P(2),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(2),
SKIP_P(1),
SKIP_C(67),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "C", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
// SKIP_C(1),
// SKIP_P(4),
// SKIP_C(3),
@@ -177,176 +177,176 @@ static MacGuiImpl::MacSTRSParsingEntry strsLoomTable[] = {
static MacGuiImpl::MacSTRSParsingEntry strsMI1Table[] = {
SKIP_C(93),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
// SKIP_C(75)
};
static MacGuiImpl::MacSTRSParsingEntry strsMI2Variant1Table[] = {
SKIP_C(93),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIRoughCommandMsg, "C", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIRoughCommandMsg, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(1),
SKIP_P(1),
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString35, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString36, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString37, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString38, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString39, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString40, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString35, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString36, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString37, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString38, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString39, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString40, MacGuiImpl::kStrPascal, 1 },
// SKIP_C(95)
};
static MacGuiImpl::MacSTRSParsingEntry strsMI2Variant2Table[] = {
SKIP_C(93),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(2),
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIRoughCommandMsg, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIRoughCommandMsg, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(1),
SKIP_P(1),
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString35, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString36, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString37, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString38, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString39, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString40, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString35, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString36, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString37, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString38, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString39, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString40, MacGuiImpl::kStrPascal, 1 },
// SKIP_C(95)
};
@@ -357,185 +357,185 @@ static MacGuiImpl::MacSTRSParsingEntry strsIndy4CDVariant1Table[] = {
SKIP_P(10),
SKIP_C(51),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_P(2),
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIRoughCommandMsg, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIRoughCommandMsg, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString35, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString36, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString37, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString35, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString36, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString37, MacGuiImpl::kStrPascal, 1 },
};
static MacGuiImpl::MacSTRSParsingEntry strsIndy4FloppyVariant1Table[] = {
SKIP_C(93),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIRoughCommandMsg, "C", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIRoughCommandMsg, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString38, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString35, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString36, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString37, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString38, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString35, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString36, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString37, MacGuiImpl::kStrPascal, 1 },
};
static MacGuiImpl::MacSTRSParsingEntry strsIndy4FloppyVariant2Table[] = {
SKIP_C(93),
SKIP_P(1),
- { MacGuiImpl::kMSIAboutGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_P(2),
- { MacGuiImpl::kMSIAreYouSureYouWantToQuit, "C", 1 },
- { MacGuiImpl::kMSIRoughCommandMsg, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToQuit, MacGuiImpl::kStrC, 1 },
+ { MacGuiImpl::kMSIRoughCommandMsg, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIAreYouSureYouWantToRestart, "C", 1 },
+ { MacGuiImpl::kMSIAreYouSureYouWantToRestart, MacGuiImpl::kStrC, 1 },
SKIP_C(1),
SKIP_P(1),
- { MacGuiImpl::kMSIGameName, "Pascal", 1 },
+ { MacGuiImpl::kMSIGameName, MacGuiImpl::kStrPascal, 1 },
SKIP_C(1),
- { MacGuiImpl::kMSIOpenGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSIOpenGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
SKIP_P(1),
- { MacGuiImpl::kMSISaveGameFileAs, "Pascal", 1 },
- { MacGuiImpl::kMSIGameFile, "Pascal", 1 },
+ { MacGuiImpl::kMSISaveGameFileAs, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIGameFile, MacGuiImpl::kStrPascal, 1 },
SKIP_C(6),
SKIP_P(2),
- { MacGuiImpl::kMSIAboutString1, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString2, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString3, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString4, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString5, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString6, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString7, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString8, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString9, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString10, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString11, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString12, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString13, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString14, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString15, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString16, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString17, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString18, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString19, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString20, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString21, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString22, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString23, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString38, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString24, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString25, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString26, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString27, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString28, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString29, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString30, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString31, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString32, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString33, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString34, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString35, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString36, "Pascal", 1 },
- { MacGuiImpl::kMSIAboutString37, "Pascal", 1 },
+ { MacGuiImpl::kMSIAboutString1, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString2, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString3, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString4, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString5, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString6, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString7, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString8, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString9, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString10, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString11, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString12, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString13, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString14, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString15, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString16, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString17, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString18, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString19, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString20, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString21, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString22, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString23, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString38, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString24, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString25, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString26, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString27, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString28, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString29, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString30, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString31, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString32, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString33, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString34, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString35, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString36, MacGuiImpl::kStrPascal, 1 },
+ { MacGuiImpl::kMSIAboutString37, MacGuiImpl::kStrPascal, 1 },
};
#undef SKIP_C
@@ -635,16 +635,16 @@ void MacGuiImpl::parseSTRSBlock(uint8 *strsData, MacSTRSParsingEntry *parsingTab
if (entry.strId == kMSISkip) {
for (int j = 0; j < entry.numStrings; j++) {
- entry.parsingMethod == "C" ? readCString(strsData) : readPascalString(strsData);
+ entry.parsingMethod == MacGuiImpl::kStrC ? readCString(strsData) : readPascalString(strsData);
}
} else {
for (int j = 0; j < entry.numStrings; j++) {
- if (entry.parsingMethod == "C") {
+ if (entry.parsingMethod == MacGuiImpl::kStrC) {
_strsStrings[entry.strId] = readCString(strsData);
- } else if (entry.parsingMethod == "Pascal") {
+ } else if (entry.parsingMethod == MacGuiImpl::kStrPascal) {
_strsStrings[entry.strId] = readPascalString(strsData);
} else {
- error("MacGuiImpl::parseSTRSBlock(): invalid parsing method encountered (%s)", entry.parsingMethod.c_str());
+ error("MacGuiImpl::parseSTRSBlock(): invalid parsing method encountered (%d)", entry.parsingMethod);
}
}
}
More information about the Scummvm-git-logs
mailing list