Skip to content

Commit 57973e7

Browse files
committed
Remove DLC Warning + Unused Locales
Unlike Unleashed, 06 DLC only adds new stages and does not affect base game content Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent 1cb06b5 commit 57973e7

2 files changed

Lines changed: 0 additions & 54 deletions

File tree

MarathonRecomp/locale/locale.cpp

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -394,17 +394,6 @@ std::unordered_map<std::string_view, std::unordered_map<ELanguage, std::string>>
394394
{ ELanguage::Italian, "GIOCO" }
395395
}
396396
},
397-
{
398-
"Installer_Step_Update",
399-
{
400-
{ ELanguage::English, "UPDATE" },
401-
{ ELanguage::Japanese, "アップデート" },
402-
{ ELanguage::German, "UPDATE" },
403-
{ ELanguage::French, "MISE À JOUR" },
404-
{ ELanguage::Spanish, "ACTUALIZACIÓN" },
405-
{ ELanguage::Italian, "AGGIORNAMENTO" }
406-
}
407-
},
408397
{
409398
// Japanese Notes: This localization should include furigana.
410399
"Installer_Step_RequiredSpace",
@@ -536,32 +525,6 @@ std::unordered_map<std::string_view, std::unordered_map<ELanguage, std::string>>
536525
{ ELanguage::Italian, "Seleziona una cartella che contiene\ni file non modificati che sono stati\nestratti dal gioco.\n\nQuesti file possono essere ottenuti\ndall'hard drive della tua Xbox 360\nseguendo le istruzioni\nsulla pagina GitHub.\n\nPer selezionare una copia digitale\nusa l'opzione \"Aggiungi file\"." }
537526
}
538527
},
539-
{
540-
// Notes: message appears when providing a title update that does not match the region or version of the game dump.
541-
// Japanese Notes: This localization should include furigana.
542-
"Installer_Message_IncompatibleGameData",
543-
{
544-
{ ELanguage::English, "The specified game and\ntitle update are incompatible.\n\nPlease ensure the files are\nfor the same version and\nregion and try again." },
545-
{ ELanguage::Japanese, "[指定:してい]されたゲームとタイトルアップデートは[互換性:ごかんせい]がありません\n\nファイルのバージョンと[地域:ちいき]が\n[同:おな]じであることを[確認:かくにん]して\nもう[一度:いちど]お[試:ため]しください" },
546-
{ ELanguage::German, "Die ausgewählten Spiel- und\nUpdatedateien sind inkompatibel.\n\nBitte stelle sicher, dass\ndie Dateien für die selbe\nVersion und Region vorgesehen sind\nund versuche es erneut." },
547-
{ ELanguage::French, "Les fichiers du jeu et la mise à\njour sont incompatibles.\n\nVeuillez vous assurer que les\nfichiers sont pour la même\nversion/région puis réessayez." },
548-
{ ELanguage::Spanish, "El juego seleccionado\ny su actualización son incompatibles.\n\nPor favor, asegúrate de que que los archivos\nson de la misma versión y\nregión e inténtalo de nuevo." },
549-
{ ELanguage::Italian, "I file del gioco\ne dell'aggiornamento sono incompatibili.\n\nAssicurati che i file sono\ndella stessa versione\ne regione e riprova." }
550-
}
551-
},
552-
{
553-
// Notes: message appears when clicking Skip at the DLC step.
554-
// Japanese Notes: This localization should include furigana.
555-
"Installer_Message_DLCWarning",
556-
{
557-
{ ELanguage::English, "It is highly recommended\nthat you install all of the\nDLC, as it includes high\nquality lighting textures\nfor the base game.\n\nAre you sure you want to\nskip this step?" },
558-
{ ELanguage::Japanese, "ベースゲーム[用:よう]の[高品質:こうひんしつ]の\n[照明:しょうめい]テクスチャが[含:ふく]まれているため\nすべてのDLCをインストールすることを\n[強:つよ]くお[勧:すす]めします\n\nこの[手順:てじゅん]をスキップしてもよろしいですか?" },
559-
{ ELanguage::German, "Es wird empgohlen alle Erweiterungen zu installieren, da sie Beleuchtungs-Texturen in einer höheren Qualität für das Basisspiel beinhalten.\n\nBist du dir sicher, dass du diesen Schritt überspringen möchtest?" },
560-
{ ELanguage::French, "Il est fortement recommandé\nd'installer l'ensemble du\nDLC car elle inclut des\ntextures de lumière de\nhaute qualité pour le jeu\nde base.\n\nÊtes-vous sûr de vouloir\nignorer cette étape ?" },
561-
{ ELanguage::Spanish, "Se recomienda encarecidamente\ninstalar todo el DLC, ya que\ncontiene texturas de iluminación\nde alta calidad para el juego base.\n\n¿Seguro que quieres saltar este paso?" },
562-
{ ELanguage::Italian, "Si consiglia di installare\ntutti i DLC, poichè includono\ntexture di illuminazione di qualità migliore.\n\nSei sicuro di voler saltare?" }
563-
}
564-
},
565528
{
566529
// Notes: message appears when choosing the Install option at the title screen when the user is missing DLC content.
567530
// Japanese Notes: This localization should include furigana.

MarathonRecomp/ui/installer_wizard.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,16 +1212,6 @@ static void DrawNavigationButton()
12121212
{
12131213
if (g_currentPage == WizardPage::SelectDLC)
12141214
{
1215-
// Check if any of the DLC was not specified.
1216-
bool dlcIncomplete = false;
1217-
for (int i = 0; (i < int(DLC::Count)) && !dlcIncomplete; i++)
1218-
{
1219-
if (g_dlcSourcePaths[i].empty() && !g_dlcInstalled[i])
1220-
{
1221-
dlcIncomplete = true;
1222-
}
1223-
}
1224-
12251215
bool dlcInstallerMode = g_gameSourcePath.empty();
12261216
std::string sourcesErrorMessage;
12271217
if (!InstallerParseSources(sourcesErrorMessage))
@@ -1237,13 +1227,6 @@ static void DrawNavigationButton()
12371227
g_currentMessagePromptConfirmation = false;
12381228
g_currentPage = dlcInstallerMode ? WizardPage::SelectDLC : WizardPage::SelectGame;
12391229
}
1240-
else if (dlcIncomplete && !dlcInstallerMode)
1241-
{
1242-
// Not all the DLC was specified, we show a prompt and await a confirmation before starting the installer.
1243-
g_currentMessagePrompt = Localise("Installer_Message_DLCWarning");
1244-
g_currentMessagePromptSource = MessagePromptSource::Next;
1245-
g_currentMessagePromptConfirmation = true;
1246-
}
12471230
else if (skipButton && dlcInstallerMode)
12481231
{
12491232
// Nothing was selected and the installer was in DLC mode, just close it.

0 commit comments

Comments
 (0)