diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Companion.cpp | 8 | ||||
| -rw-r--r-- | src/Companion.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Companion.cpp b/src/Companion.cpp index bd8ef32..bef1667 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -354,7 +354,7 @@ void Companion::ParseCurrentFileConfig(YAML::Node node) { this->gEnablePadGen = GetSafeNode<bool>(node, "autopads", true); this->gNodeForceProcessing = GetSafeNode<bool>(node, "force", false); - this->gSingleCodeFile = !GetSafeNode<bool>(node, "individual_data_incs", false); + this->gIndividualIncludes = GetSafeNode<bool>(node, "individual_data_incs", false); } void Companion::ParseHash() { @@ -953,7 +953,7 @@ void Companion::Process() { stream << "// 0x" << std::hex << std::uppercase << ASSET_PTR(result.endptr.value()) << "\n\n"; } - if(hasSize && i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code && this->gSingleCodeFile){ + if(hasSize && i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code && !this->gIndividualIncludes){ int32_t startptr = ASSET_PTR(result.endptr.value()); int32_t end = ASSET_PTR(entries[i + 1].addr); @@ -986,7 +986,7 @@ void Companion::Process() { } } - if (this->gConfig.exporterType == ExportType::Code && !this->gSingleCodeFile) { + if (this->gConfig.exporterType == ExportType::Code && this->gIndividualIncludes) { fs::path outinc = fs::path(this->gConfig.outputPath) / this->gCurrentDirectory.parent_path() / (result.name + ".inc.c"); if(!exists(outinc.parent_path())){ @@ -1007,7 +1007,7 @@ void Companion::Process() { this->gWriteMap.clear(); - if (this->gConfig.exporterType != ExportType::Code || this->gSingleCodeFile) { + if (this->gConfig.exporterType != ExportType::Code || !this->gIndividualIncludes) { std::string buffer = stream.str(); if(buffer.empty()) { diff --git a/src/Companion.h b/src/Companion.h index 487cbac..0f1f1c0 100644 --- a/src/Companion.h +++ b/src/Companion.h @@ -118,7 +118,7 @@ public: GBIMinorVersion GetGBIMinorVersion() const { return this->gConfig.gbi.subversion; } std::unordered_map<std::string, std::vector<YAML::Node>> GetCourseMetadata() { return this->gCourseMetadata; } std::optional<std::string> GetEnumFromValue(const std::string& key, int id); - bool IsSingleCodeFile() const { return this->gSingleCodeFile; } + bool IsSingleCodeFile() const { return this->gIndividualIncludes; } std::optional<ParseResultData> GetParseDataByAddr(uint32_t addr); std::optional<ParseResultData> GetParseDataBySymbol(const std::string& symbol); @@ -154,7 +154,7 @@ private: std::vector<uint8_t> gRomData; std::filesystem::path gRomPath; bool gNodeForceProcessing = false; - bool gSingleCodeFile = true; + bool gIndividualIncludes = false; YAML::Node gHashNode; std::shared_ptr<N64::Cartridge> gCartridge; std::unordered_map<std::string, std::vector<YAML::Node>> gCourseMetadata; |
