diff --git a/devtools/create_nancy/create_nancy.cpp b/devtools/create_nancy/create_nancy.cpp index 6f1b8f34013..61ff971d663 100644 --- a/devtools/create_nancy/create_nancy.cpp +++ b/devtools/create_nancy/create_nancy.cpp @@ -44,7 +44,7 @@ * 2 bytes Number of games (ignoring multiple languages) * 4 bytes per game File offsets for every game's data * Rest of file Game data - * + * * Game data contents: * Various data sections, depending on title; * e.g.: only nancy1 has a hint section, since later @@ -53,14 +53,14 @@ * 4 bytes Offset to next section * 4 bytes Section tag (generated using MKTAG macro) * variable Section data - * + * * Arrays in the game data are variable-size. * All arrays are preceded by a 2-byte size property. * 2D arrays with strings (e.g conditional dialogue) are also preceded * by a list of 4-byte offsets (one per language). * All offsets are absolute (relative to start of file). * All data is little endian. - * + * * Game order: * The Vampire Diaries * Nancy Drew: Secrets Can Kill @@ -108,8 +108,8 @@ void writeSoundChannels(File &output, const SoundChannelInfo &soundChannelInfo) writeToFile(output, soundChannelInfo.sfxChannels); } -void writeLanguages(File &output, const Common::Array &languages) { - output.writeUint32(MKTAG('L', 'A', 'N', 'G')); +void writeLanguages(File &output, const Common::Array &languages) { + output.writeUint32(MKTAG('L', 'A', 'N', '2')); writeToFile(output, languages); } @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) { WRAPWITHOFFSET(writeGoodbyes(output, _tvdGoodbyes, _tvdGoodbyeTexts)) WRAPWITHOFFSET(writeEmptySaveTexts(output, _tvdEmptySaveStrings)) WRAPWITHOFFSET(writeEventFlagNames(output, _tvdEventFlagNames)) - + // Nancy Drew: Secrets Can Kill data gameOffsets.push_back(output.pos()); WRAPWITHOFFSET(writeConstants(output, _nancy1Constants)) @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) { WRAPWITHOFFSET(writeRingingTexts(output, _nancy1TelephoneRinging)) WRAPWITHOFFSET(writeEmptySaveTexts(output, _nancy1EmptySaveStrings)) WRAPWITHOFFSET(writeEventFlagNames(output, _nancy1EventFlagNames)) - + // Nancy Drew: Stay Tuned for Danger data gameOffsets.push_back(output.pos()); WRAPWITHOFFSET(writeConstants(output, _nancy2Constants)) @@ -235,7 +235,7 @@ int main(int argc, char *argv[]) { WRAPWITHOFFSET(writeEventFlagNames(output, _nancy2EventFlagNames)) WRAPWITHOFFSET(writePatchFile(output, 3, nancy2PatchSrcFiles, "files/nancy2")) WRAPWITHOFFSET(writePatchAssociations(output, nancy2PatchAssociations)) - + // Nancy Drew: Message in a Haunted Mansion data gameOffsets.push_back(output.pos()); WRAPWITHOFFSET(writeConstants(output, _nancy3Constants)) @@ -248,7 +248,7 @@ int main(int argc, char *argv[]) { WRAPWITHOFFSET(writeEventFlagNames(output, _nancy3EventFlagNames)) WRAPWITHOFFSET(writePatchFile(output, 4, nancy3PatchSrcFiles, "files/nancy3")) WRAPWITHOFFSET(writePatchAssociations(output, nancy3PatchAssociations)) - + // Nancy Drew: Treasure in the Royal Tower data gameOffsets.push_back(output.pos()); WRAPWITHOFFSET(writeConstants(output, _nancy4Constants)) diff --git a/devtools/create_nancy/nancy1_data.h b/devtools/create_nancy/nancy1_data.h index 2f1286a9c3c..3edf5b02dc5 100644 --- a/devtools/create_nancy/nancy1_data.h +++ b/devtools/create_nancy/nancy1_data.h @@ -39,9 +39,9 @@ const Common::Array _nancy1MapAccessSceneIDs = { 9, 10, 11, 666, 888, 1200, 1250, 1666 }; -const Common::Array _nancy1LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy1LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy1ConditionalDialogue = { @@ -84,7 +84,7 @@ const Common::Array> _nancy1ConditionalDialog { { kEv, 0x1E, kFalse }, { kEv, 0x63, kTrue }, { kEv, 0x78, kFalse } } } }, { // Connie, 10 responses - { 26, 233, "CIC1", + { 26, 233, "CIC1", { { kEv, 0x1D, kTrue }, { kEv, 0x18, kFalse } } }, { 25, 234, "CIC2", { { kEv, 0x1F, kTrue }, { kEv, 0x19, kFalse } } }, @@ -97,7 +97,7 @@ const Common::Array> _nancy1ConditionalDialog { 21, 238, "CIC6", { { kEv, 2, kTrue }, { kEv, 3, kTrue }, { kEv, 0x17, kFalse } } }, { 13, 239, "DIC5", - { { kEv, 0x64, kTrue }, { kEv, 0x16, kFalse } } }, + { { kEv, 0x64, kTrue }, { kEv, 0x16, kFalse } } }, { 20, 240, "CIC8", { { kEv, 0x5, kTrue }, { kEv, 0x14, kFalse } } }, { 19, 245, "CIC9", diff --git a/devtools/create_nancy/nancy2_data.h b/devtools/create_nancy/nancy2_data.h index 6dc14e2dc87..e7791701abe 100644 --- a/devtools/create_nancy/nancy2_data.h +++ b/devtools/create_nancy/nancy2_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy2Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy2LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy2LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy2ConditionalDialogue = { diff --git a/devtools/create_nancy/nancy3_data.h b/devtools/create_nancy/nancy3_data.h index 2d82b992f59..b8f9b558fc9 100644 --- a/devtools/create_nancy/nancy3_data.h +++ b/devtools/create_nancy/nancy3_data.h @@ -42,9 +42,9 @@ const SoundChannelInfo _nancy3andUpSoundChannelInfo = { { 4, 5, 6, 7, 8, 9, 10, 11, 17, 18, 20, 21, 22, 23, 24, 25, 31 } }; -const Common::Array _nancy3LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy3LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy3ConditionalDialogue = { @@ -212,7 +212,7 @@ const Common::Array> _nancy3ConditionalDialog }, { // Ned, 0 responses }, -{ // Rose, +{ // Rose, { 75, 1750, "NRM17", { { kEv, 211, true }, { kEv, 186, false } } }, { 76, 1751, "NRM18", diff --git a/devtools/create_nancy/nancy4_data.h b/devtools/create_nancy/nancy4_data.h index 984a40cc1d0..433dc9a342e 100644 --- a/devtools/create_nancy/nancy4_data.h +++ b/devtools/create_nancy/nancy4_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy4Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy4LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy4LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy4ConditionalDialogue = { @@ -300,7 +300,7 @@ const Common::Array> _nancy4ConditionalDialogueTexts "How can I get to that secret door when the elevator's always in the way?", // NDN24a // 65 "According to the decoder, the symbols in the stained glass window mean 'Purple Rose Holds Diamond Key of Queen.'", // NDN25a - "How do you think Ezra Wickford got his hands on Marie Antoinette's red medallion?", // NDN26 + "How do you think Ezra Wickford got his hands on Marie Antoinette's red medallion?", // NDN26 "How do you think Professor Hotchkiss ended up with Marie Antoinette's green medallion?", // NDN27 "What do you think 'hope to those who search' means?", // NDN28 "What do you think 'Diamond of misery in my journal' means?", // NDN29 diff --git a/devtools/create_nancy/nancy5_data.h b/devtools/create_nancy/nancy5_data.h index 5cdeaf2cb23..821d478b10d 100644 --- a/devtools/create_nancy/nancy5_data.h +++ b/devtools/create_nancy/nancy5_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy5Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy5LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy5LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy5ConditionalDialogue = { diff --git a/devtools/create_nancy/nancy6_data.h b/devtools/create_nancy/nancy6_data.h index b0074b9d654..c30e645e53e 100644 --- a/devtools/create_nancy/nancy6_data.h +++ b/devtools/create_nancy/nancy6_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy6Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy6LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy6LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy6ConditionalDialogue = { diff --git a/devtools/create_nancy/nancy7_data.h b/devtools/create_nancy/nancy7_data.h index 0d9278a3ab1..04e9a31e481 100644 --- a/devtools/create_nancy/nancy7_data.h +++ b/devtools/create_nancy/nancy7_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy7Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy7LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy7LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy7ConditionalDialogue = { diff --git a/devtools/create_nancy/nancy8_data.h b/devtools/create_nancy/nancy8_data.h index 4a2c127cd1d..0f1b44359f6 100644 --- a/devtools/create_nancy/nancy8_data.h +++ b/devtools/create_nancy/nancy8_data.h @@ -35,9 +35,9 @@ const GameConstants _nancy8Constants ={ 32 // wonGameFlagID }; -const Common::Array _nancy8LanguagesOrder = { - Common::Language::EN_ANY, - Common::Language::RU_RUS +const Common::Array _nancy8LanguagesOrder = { + GameLanguage::kEnglish, + GameLanguage::kRussian }; const Common::Array> _nancy8ConditionalDialogue = { diff --git a/devtools/create_nancy/tvd_data.h b/devtools/create_nancy/tvd_data.h index 11f5ae6bf92..65833cd91cb 100644 --- a/devtools/create_nancy/tvd_data.h +++ b/devtools/create_nancy/tvd_data.h @@ -44,8 +44,8 @@ const SoundChannelInfo _tvdToNancy2SoundChannelInfo = { { 3, 4, 5, 6, 17, 18, 20, 21, 22, 23, 24, 25, 26, 31 } }; -const Common::Array _tvdLanguagesOrder = { - Common::Language::EN_ANY +const Common::Array _tvdLanguagesOrder = { + GameLanguage::kEnglish }; const Common::Array> _tvdConditionalDialogue = { diff --git a/devtools/create_nancy/types.h b/devtools/create_nancy/types.h index 1b30ddf7f28..fbd0cf4d442 100644 --- a/devtools/create_nancy/types.h +++ b/devtools/create_nancy/types.h @@ -30,6 +30,7 @@ enum NancyFlag : byte { kFalse = 1, kTrue = 2 }; enum ConditionType : byte { kEv = 0, kIn = 1, kDi = 2 }; +enum GameLanguage : byte { kEnglish = 0, kRussian = 1, kGerman = 2, kFrench = 3 }; struct GameConstants { uint16 numItems;