From 05971d5bb538b5038b944c156ca9a7891227bddf Mon Sep 17 00:00:00 2001 From: krs Date: Wed, 18 Jan 2023 19:14:26 +0200 Subject: [PATCH] Resource converter changes after review. --- mapeditor/resourceExtractor/ResourceConverter.cpp | 6 +++--- mapeditor/resourceExtractor/ResourceConverter.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mapeditor/resourceExtractor/ResourceConverter.cpp b/mapeditor/resourceExtractor/ResourceConverter.cpp index 8c27c643b..3dcfa17a6 100644 --- a/mapeditor/resourceExtractor/ResourceConverter.cpp +++ b/mapeditor/resourceExtractor/ResourceConverter.cpp @@ -29,7 +29,7 @@ void ResourceConverter::convertExtractedResourceFiles(ConversionOptions conversi std::vector defFiles = { "TwCrPort.def", "CPRSMALL.def", "FlagPort.def", "ITPA.def", "ITPt.def", "Un32.def", "Un44.def" }; if(conversionOptions.splitDefs) - splitDefFiles(spritesPath, defFiles, conversionOptions.deleteOriginals); + splitDefFiles(defFiles, spritesPath, conversionOptions.deleteOriginals); if(conversionOptions.convertPcxToPng) doConvertPcxToPng(imagesPath, conversionOptions.deleteOriginals); @@ -83,10 +83,10 @@ void ResourceConverter::splitDefFile(const std::string & fileName, const bfs::pa logGlobal->error("Def File Split error! " + fileName); } -void ResourceConverter::splitDefFiles(const bfs::path & sourceFolder, std::vector defFileNames, bool deleteOriginals) +void ResourceConverter::splitDefFiles(const std::vector & defFileNames, const bfs::path & sourceFolder, bool deleteOriginals) { logGlobal->info("Splitting Def Files from folder: %s ...\n", sourceFolder); - for(std::string defFilename : defFileNames) + for(const auto & defFilename : defFileNames) splitDefFile(defFilename, sourceFolder, deleteOriginals); } diff --git a/mapeditor/resourceExtractor/ResourceConverter.h b/mapeditor/resourceExtractor/ResourceConverter.h index b4633c287..e2d269eeb 100644 --- a/mapeditor/resourceExtractor/ResourceConverter.h +++ b/mapeditor/resourceExtractor/ResourceConverter.h @@ -53,5 +53,5 @@ private: /** Splits the given .def files into individual images. * For each .def file, the resulting images will be output in the same folder, in a subfolder (named just like the .def file) */ - static void splitDefFiles(const bfs::path & sourceFolder, std::vector defFileNames, bool deleteOriginals); + static void splitDefFiles(const std::vector & defFileNames, const bfs::path & sourceFolder, bool deleteOriginals); };