diff --git a/src/Companion.h b/src/Companion.h index 0f1f1c0..20c5822 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> GetCourseMetadata() { return this->gCourseMetadata; } std::optional GetEnumFromValue(const std::string& key, int id); - bool IsSingleCodeFile() const { return this->gIndividualIncludes; } + bool IsUsingIndividualIncludes() const { return this->gIndividualIncludes; } std::optional GetParseDataByAddr(uint32_t addr); std::optional GetParseDataBySymbol(const std::string& symbol); diff --git a/src/factories/TextureFactory.cpp b/src/factories/TextureFactory.cpp index d3bc923..341302d 100644 --- a/src/factories/TextureFactory.cpp +++ b/src/factories/TextureFactory.cpp @@ -158,7 +158,7 @@ ExportResult TextureCodeExporter::Export(std::ostream &write, std::shared_ptrIsSingleCodeFile()){ + if (!Companion::Instance->IsUsingIndividualIncludes()){ std::ofstream file(dpath + ".inc.c", std::ios::binary); file << imgstream.str(); file.close(); @@ -178,7 +178,7 @@ ExportResult TextureCodeExporter::Export(std::ostream &write, std::shared_ptrIsSingleCodeFile()){ + if (!Companion::Instance->IsUsingIndividualIncludes()){ write << tab << tab << "#include \"" << Companion::Instance->GetOutputPath() + "/" << *replacement << ".inc.c\"\n"; } else { write << imgstream.str(); @@ -194,7 +194,7 @@ ExportResult TextureCodeExporter::Export(std::ostream &write, std::shared_ptr(node, "ctype", "u8") << " " << symbol << "[] = {\n"; - if (Companion::Instance->IsSingleCodeFile()){ + if (!Companion::Instance->IsUsingIndividualIncludes()){ write << tab << "#include \"" << Companion::Instance->GetOutputPath() + "/" << *replacement << ".inc.c\"\n"; } else { write << imgstream.str();