diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2026-07-09 07:52:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-09 07:52:00 -0500 |
| commit | a7e3e7c29be41cf67d89bdcb2f501d36d6106544 (patch) | |
| tree | 15e9507a675ea46f0384575660bc207c78f14e43 | |
| parent | 155e8a9ae0745e56d38529dd62781e83e17a36e7 (diff) | |
Remove second ROM prompt, doesn't make sense for MM (#1788)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | mm/2s2h/BenPort.cpp | 22 |
2 files changed, 2 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore index a8d271bfe..038341be4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ shipofharkinian.json imgui.ini saves/* randomizer/* +mods/* 2S2HTimeSplitData.json mm/libultraship/extern/Debug/ImGui.lib diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index 460b66f96..91d151b77 100644 --- a/mm/2s2h/BenPort.cpp +++ b/mm/2s2h/BenPort.cpp @@ -208,7 +208,6 @@ typedef enum PromptSteps { PS_FILE_CHECK, PS_LOCAL, PS_FIRST, - PS_SECOND, PS_DUPE, PS_WAIT, PS_NONE, @@ -507,31 +506,12 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) { extractionTask = threadPool->submit_task([&]() -> void { extract.CallZapd(installPath, Ship::Context::GetAppDirectoryPath(appShortName), &extractCount, &totalExtract); - promptStep = PS_SECOND; + extractStep = ES_VERIFY; extractCount = 0; totalExtract = 0; }); continue; } - case PS_SECOND: { - BenGui::RegisterPopup( - "Extraction Complete", "ROM Extracted. Extract another?", "Yes", "No", - [&]() { - if (!extract.ManuallySearchForRomMatchingType(RomSearchMode::Vanilla)) { - extractStep = ES_VERIFY; - } else { - extractionTask = threadPool->submit_task([&]() -> void { - extract.CallZapd(installPath, Ship::Context::GetAppDirectoryPath(appShortName), - &extractCount, &totalExtract); - extractStep = ES_VERIFY; - extractCount = 0; - totalExtract = 0; - }); - } - }, - [&]() { extractStep = ES_VERIFY; }); - continue; - } default: break; } |