add --scriptsFormatter opt in fastfile tool to select gsc decompiler formatter

Author: ate47

src/acts/tools/fastfile/fastfile_handlers.cpp

@@ -278,6 +278,10 @@ namespace fastfile {
 	}
 
 
+	FastFileOption::FastFileOption() {
+		gscFormatter = &tool::gsc::formatter::GetDefaultFormatter();
+	}
+
 	FastFileOption::~FastFileOption() {
 		if (cascStorage) {
 			CascCloseStorage(cascStorage);
@@ -437,6 +441,21 @@ namespace fastfile {
 			else if (!_strcmpi("--dumpBinaryAssetsMap", arg)) {
 				dumpBinaryAssetsMap = true;
 			}
+			else if (!_strcmpi("--scriptsFormatter", arg)) {
+				if (i + 1 == endIndex) {
+					std::cerr << "Missing value for param: " << arg << "!\n";
+					return false;
+				}
+
+				const tool::gsc::formatter::FormatterInfo* fmt{ tool::gsc::formatter::GetFromName(args[++i]) };
+
+				if (!fmt) {
+					LOG_ERROR("Unknown gsc formatter: {}!", args[i]);
+					return false;
+				}
+
+				gscFormatter = fmt;
+			}
 			else if (!_strcmpi("--disableScriptsDecomp", arg)) {
 				disableScriptsDecomp = true;
 			}
@@ -510,6 +529,7 @@ namespace fastfile {
 		LOG_INFO("--dumpBinaryAssetsMap     : Dump binary assets map");
 		LOG_INFO("--dumpAssetNames          : Dump binary assets");
 		LOG_INFO("--dumpCompiledZone        : Dump compiled zone file");
+		LOG_INFO("--scriptsFormatter [f]    : Set formatter for GSC decompiler");
 		LOG_INFO("--disableScriptsDecomp    : Disable GSC script decompilation");
 		LOG_INFO("--dumpXStrings            : Dump XStrings");
 		LOG_INFO("--graphic                 : Dump graphic assets (do not share graphic assets)");

src/acts/tools/fastfile/fastfile_handlers.hpp

@@ -4,6 +4,7 @@
 #include <core/memory_allocator.hpp>
 #include <tools/fastfile/fastfile_zone.hpp>
 #include <tools/gsc/gsc_opcodes_load.hpp>
+#include <tools/gsc/decompiler/gsc_decompiler_formatter.hpp>
 #include <utils/compress_utils.hpp>
 #define LTC_NO_PROTOTYPES
 #include <tomcrypt.h>
@@ -153,7 +154,9 @@ namespace fastfile {
 		std::vector<std::set<uint64_t>> assetNames{};
 		std::unordered_map<uint64_t, const char*> translationKeys{};
 		core::memory_allocator::MemoryAllocator alloc{};
+		const tool::gsc::formatter::FormatterInfo* gscFormatter{};
 
+		FastFileOption();
 		~FastFileOption();
 		bool Compute(const char** args, size_t startIndex, size_t endIndex);
 		void PrintHelp();

src/acts/tools/fastfile/handlers/bo3/bo3_unlinker_scriptparsetree.cpp

@@ -46,6 +46,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / "bo3" / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 
 				std::vector<byte> scriptData;
 				byte* alignedAlloc{ utils::Aligned(spt->buffer, 0x20) };

src/acts/tools/fastfile/handlers/bo4/bo4_unlinker_scriptparsetree.cpp

@@ -69,6 +69,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / "bo4" / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 
 				std::vector<byte> scriptData;
 				byte* alignedAlloc{ utils::Aligned(spt->buffer, 0x20) };

src/acts/tools/fastfile/handlers/bo6/bo6_unlinker_gscobj.cpp

@@ -72,6 +72,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / gamePath / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 				if (opt.translation) {
 					gdctx.opt.LookupLocalizedFunc = LookupLocalizedImpl;
 				}

src/acts/tools/fastfile/handlers/bo6sp/bo6sp_unlinker_gscobj.cpp

@@ -72,6 +72,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / "bo6sp" / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 				if (opt.translation) {
 					gdctx.opt.LookupLocalizedFunc = LookupLocalizedImpl;
 				}

src/acts/tools/fastfile/handlers/bo7/bo7_unlinker_gscobj.cpp

@@ -74,6 +74,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / gamePath / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 				if (opt.translation) {
 					gdctx.opt.LookupLocalizedFunc = LookupLocalizedImpl;
 				}

src/acts/tools/fastfile/handlers/cw/cw_unlinker_scriptparsetree.cpp

@@ -41,6 +41,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / "cw" / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 
 				std::vector<byte> scriptData;
 				byte* alignedAlloc{ utils::Aligned(asset->buffer, 0x20) };

src/acts/tools/fastfile/handlers/handler_gsc.cpp

@@ -32,6 +32,7 @@ namespace {
             std::filesystem::path outSource{ opt.m_output / "gsc_decomp" };
             std::string outSourceStr{ outSource.string() };
             gdctx.opt.m_outputDir = outSourceStr.data();
+            gdctx.opt.m_formatter = opt.gscFormatter;
 
             std::vector<byte> scriptData;
             byte* alignedAlloc{ utils::Aligned(file, 0x20) };

src/acts/tools/fastfile/handlers/mwiii/mwiii_unlinker_gscobj.cpp

@@ -73,6 +73,7 @@ namespace {
 				std::filesystem::path outSource{ opt.m_output / gamePath / "source" };
 				std::string outSourceStr{ outSource.string() };
 				gdctx.opt.m_outputDir = outSourceStr.data();
+				gdctx.opt.m_formatter = opt.gscFormatter;
 				if (opt.translation) {
 					gdctx.opt.LookupLocalizedFunc = LookupLocalizedImpl;
 				}