Skip to content

Final Extraction Flow Fixes #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KiritoDv merged 2 commits into from
Jan 23, 2026
Merged

Final Extraction Flow Fixes #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
611e18a
Moved logging init back to after the extraction block to prevent extr…
Malkierian Jan 23, 2026
418d83f
clang
Malkierian Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions src/port/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ OTRVersion DetectOTRVersion(std::string fileName) {
}

bool VerifyArchiveVersion(OTRVersion version) {
return version.major != INT16_MAX && version.minor != INT16_MAX &&
(version.major == gBuildVersionMajor || version.minor == gBuildVersionMinor);
return version.major == gBuildVersionMajor && version.minor == gBuildVersionMinor;
}

GameEngine::GameEngine() : dictionary(nullptr) {
Expand All @@ -127,42 +126,36 @@ GameEngine::GameEngine() : dictionary(nullptr) {
this->context->InitConsoleVariables(); // without this line the controldeck constructor failes in
// ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig()

#if (_DEBUG)
auto defaultLogLevel = spdlog::level::debug;
#else
auto defaultLogLevel = spdlog::level::info;
#endif
auto logLevel =
static_cast<spdlog::level::level_enum>(CVarGetInteger(CVAR_DEVELOPER_TOOLS("LogLevel"), defaultLogLevel));
context->InitLogging(logLevel, logLevel);
Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v");
SPDLOG_INFO("Starting Ghostship version {} (Branch: {} | Commit: {})", (char*)gBuildVersion, (char*)gGitBranch,
(char*)gGitCommitHash);

std::vector<std::string> archiveFiles;
const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sm64.o2r");
const std::string assets_path = Ship::Context::LocateFileAcrossAppDirs("ghostship.o2r");

bool shouldRegen = !VerifyArchiveVersion(DetectOTRVersion("sm64.o2r"));

#ifdef _WIN32
AllocConsole();
#endif
OTRVersion curVer = DetectOTRVersion("sm64.o2r");
bool shouldRegen = !VerifyArchiveVersion(curVer) && curVer.major != INT16_MAX;

if (std::filesystem::exists(main_path) && !shouldRegen) {
archiveFiles.push_back(main_path);
} else {
if (shouldRegen && std::filesystem::exists(main_path)) {
std::filesystem::remove(main_path);
}
std::string msg = (shouldRegen ? "Your ROM O2R is outdated, and needs to be re-extracted.\n\n" : "") +
std::string("Please provide a Super Mario 64 ROM.\n\nSupported Versions:\nUS\nJP\n\n"
"Assets will be extracted into an O2R file.");
if (ShowYesNoBox("Ghostship - Asset Extraction", msg.c_str()) == IDYES) {
if (shouldRegen && std::filesystem::exists(main_path)) {
std::filesystem::remove(main_path);
}
#ifdef _WIN32
AllocConsole();
#endif
if (!GenAssetFile()) {
#if defined(_WIN32) && !defined(_DEBUG)
FreeConsole();
#endif
ShowMessage("Error", "An error occured, no O2R file was generated.\n\nExiting...");
exit(1);
} else {
#if defined(_WIN32) && !defined(_DEBUG)
FreeConsole();
#endif
archiveFiles.push_back(main_path);
}
} else {
Expand Down Expand Up @@ -194,6 +187,18 @@ GameEngine::GameEngine() : dictionary(nullptr) {
}
}

#if (_DEBUG)
auto defaultLogLevel = spdlog::level::debug;
#else
auto defaultLogLevel = spdlog::level::info;
#endif
auto logLevel =
static_cast<spdlog::level::level_enum>(CVarGetInteger(CVAR_DEVELOPER_TOOLS("LogLevel"), defaultLogLevel));
context->InitLogging(logLevel, logLevel);
Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v");
SPDLOG_INFO("Starting Ghostship version {} (Branch: {} | Commit: {})", (char*)gBuildVersion, (char*)gGitBranch,
(char*)gGitCommitHash);

auto controlDeck = std::make_shared<LUS::ControlDeck>();
this->context->InitControlDeck(controlDeck);

Expand Down
6 changes: 3 additions & 3 deletions src/port/GameExtractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ std::optional<std::string> GameExtractor::ValidateChecksum() const {
void GameExtractor::WritePortVersion() {
auto writer = LUS::BinaryWriter();
writer.SetEndianness(Torch::Endianness::Big);
writer.Write((uint16_t) gBuildVersionMajor);
writer.Write((uint16_t) gBuildVersionMinor);
writer.Write((uint16_t) gBuildVersionPatch);
writer.Write((uint16_t)gBuildVersionMajor);
writer.Write((uint16_t)gBuildVersionMinor);
writer.Write((uint16_t)gBuildVersionPatch);
writer.Close();

Companion::Instance->RegisterCompanionFile("portVersion", writer.ToVector());
Expand Down
Loading