izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix modding and headers (#171)

Browse Source
This commit is contained in:
inspectredc
2025-01-17 17:32:09 -06:00
committed by GitHub
parent db4cb9a493
commit cc3063afe6
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+1 -1
View File
@@ -1100,7 +1100,7 @@ void Companion::Process() {
};
}
if(this->gConfig.exporterType == ExportType::Code && this->gConfig.modding) {
if((this->gConfig.exporterType == ExportType::Code || this->gConfig.exporterType == ExportType::Binary) && this->gConfig.modding) {
this->ParseModdingConfig();
}
src/main.cpp
+19 -6
View File
@@ -72,11 +72,14 @@ int main(int argc, char *argv[]) {
header->add_option("<baserom.z64>", filename, "")->required()->check(CLI::ExistingFile);
header->add_flag("-o,--otr", otrModeSelected, "OTR/O2R Mode");
if (otrModeSelected) {
otrMode = ArchiveType::OTR;
}
header->parse_complete_callback([&] {
if (otrModeSelected) {
otrMode = ArchiveType::OTR;
} else {
otrMode = ArchiveType::None;
}
const auto instance = Companion::Instance = new Companion(filename, otrMode, debug);
instance->Init(ExportType::Header);
});
@@ -110,14 +113,24 @@ int main(int argc, char *argv[]) {
const auto modding_import = modding_root->add_subcommand("import", "Import - Import modified files to generate C code\n");
const auto modding_export = modding_root->add_subcommand("export", "Export - Export modified files to a folder\n");
modding_import->add_option("mode", mode, "code, binary or header")->required();
modding_import->add_option("mode", mode, "code, otr, o2r or header")->required();
modding_import->add_option("<baserom.z64>", filename, "")->required()->check(CLI::ExistingFile);
modding_import->parse_complete_callback([&] {
const auto instance = Companion::Instance = new Companion(filename, ArchiveType::None, debug, true);
ArchiveType otrMode;
if (mode == "otr") {
otrMode = ArchiveType::OTR;
} else if (mode == "o2r") {
otrMode = ArchiveType::O2R;
} else {
otrMode = ArchiveType::None;
}
const auto instance = Companion::Instance = new Companion(filename, otrMode, debug, true);
if (mode == "code") {
instance->Init(ExportType::Code);
} else if (mode == "binary") {
} else if (mode == "otr" || mode == "o2r") {
instance->Init(ExportType::Binary);
} else if (mode == "header") {
instance->Init(ExportType::Header);