From 3bd6e50be86180196e66acd7acc2bc5d03fa13e5 Mon Sep 17 00:00:00 2001 From: qaate47 Date: Fri, 18 Oct 2024 16:41:45 +0200 Subject: [PATCH] use id instead of function name to define tools --- src/acts/actscli.cpp | 8 ++--- src/acts/adl/adl.cpp | 2 +- src/acts/compiler/gsc_compiler.cpp | 4 +-- src/acts/ddl/ddl.cpp | 2 +- src/acts/mods/mods.cpp | 2 +- src/acts/tools/bo3/bo3.cpp | 2 +- src/acts/tools/bo3/dumpt7.cpp | 4 +-- src/acts/tools/bo6/bo6ps4.cpp | 10 +++---- src/acts/tools/coder/error_coder.cpp | 8 ++--- src/acts/tools/compatibility/dbf_gen.cpp | 4 +-- .../tools/compatibility/scobalula_wnigen.cpp | 4 +-- .../tools/compatibility/serious_db2gen.cpp | 6 ++-- .../compatibility/serious_fakedb2gen.cpp | 2 +- .../tools/compatibility/serious_opcodes.cpp | 4 +-- src/acts/tools/console_ui.cpp | 2 +- src/acts/tools/cordycep_dump.cpp | 4 +-- src/acts/tools/cw/cw.cpp | 14 ++++----- src/acts/tools/cw/decrypt.cpp | 2 +- src/acts/tools/cw/poolt9.cpp | 18 +++++------ src/acts/tools/dump.cpp | 24 +++++++-------- src/acts/tools/fastfiles.cpp | 10 +++---- src/acts/tools/gsc.cpp | 6 ++-- src/acts/tools/gsc_demo.cpp | 2 +- src/acts/tools/gsc_gdb.cpp | 4 +-- src/acts/tools/gsc_hookmap.cpp | 4 +-- src/acts/tools/gsc_injector_ui.cpp | 4 +-- src/acts/tools/gsc_merge.cpp | 2 +- src/acts/tools/gsc_opcodes_load.cpp | 4 +-- src/acts/tools/hash.cpp | 30 +++++++++---------- src/acts/tools/hashes/compiled_files.cpp | 2 +- src/acts/tools/hashes/hash_scanner.cpp | 6 ++-- src/acts/tools/hashes/searcher.cpp | 2 +- src/acts/tools/lib/actslibtest.cpp | 4 +-- src/acts/tools/lua.cpp | 2 +- src/acts/tools/lui.cpp | 2 +- src/acts/tools/nui/test_renderer.cpp | 2 +- src/acts/tools/pool.cpp | 10 +++---- src/acts/tools/process.cpp | 6 ++-- src/acts/tools/ps4inject.cpp | 6 ++-- src/acts/tools/ps4reader.cpp | 2 +- src/acts/tools/resolver.cpp | 2 +- src/acts/tools/rosetta.cpp | 6 ++-- src/acts/tools/sp23/gscinfo.cpp | 2 +- src/acts/tools/sp23/gsctools.cpp | 2 +- src/acts/tools/sp23/sp23.cpp | 10 +++---- src/acts/tools/test.cpp | 8 ++--- src/acts/tools/tools.cpp | 10 +++---- src/acts/tools/tools.hpp | 2 +- src/acts/tools/tools_nui.cpp | 6 ++-- src/acts/tools/tools_nui.hpp | 8 ++--- src/acts/tools/tools_ui.cpp | 2 +- src/acts/tools/tools_ui.hpp | 2 +- src/acts/tools/unzip.cpp | 2 +- src/acts/tools/vm_debug.cpp | 4 +-- src/acts/tools/weapons.cpp | 2 +- 55 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/acts/actscli.cpp b/src/acts/actscli.cpp index 47a6bef..13faa3a 100644 --- a/src/acts/actscli.cpp +++ b/src/acts/actscli.cpp @@ -436,7 +436,7 @@ namespace actscli { return res; } } -ADD_TOOL("packfile", "acts", " [file=acts.acpf]", "Create ACTS pack file", nullptr, packfile); -ADD_TOOL("exit", "acts", "", "Exit repl cli", nullptr, exitcli); -ADD_TOOL("echo", "acts", "", "echo", nullptr, echocli); -ADD_TOOL("repl", "acts", "", "Use repl cli", nullptr, replcli); +ADD_TOOL(packfile, "acts", " [file=acts.acpf]", "Create ACTS pack file", nullptr, packfile); +ADD_TOOL(exit, "acts", "", "Exit repl cli", nullptr, exitcli); +ADD_TOOL(echo, "acts", "", "echo", nullptr, echocli); +ADD_TOOL(repl, "acts", "", "Use repl cli", nullptr, replcli); diff --git a/src/acts/adl/adl.cpp b/src/acts/adl/adl.cpp index 2fa8dc8..7d9da19 100644 --- a/src/acts/adl/adl.cpp +++ b/src/acts/adl/adl.cpp @@ -894,5 +894,5 @@ namespace acts::compiler::adl { return tool::OK; } - ADD_TOOL("adlc", "common", " [def] ([data] [output])", "ADL compiler", nullptr, adlcompiler); + ADD_TOOL(adlc, "common", " [def] ([data] [output])", "ADL compiler", nullptr, adlcompiler); } \ No newline at end of file diff --git a/src/acts/compiler/gsc_compiler.cpp b/src/acts/compiler/gsc_compiler.cpp index 629cb51..5a242d4 100644 --- a/src/acts/compiler/gsc_compiler.cpp +++ b/src/acts/compiler/gsc_compiler.cpp @@ -5895,6 +5895,6 @@ namespace acts::compiler { return tool::OK; } - ADD_TOOL("gscc", "gsc", " --help", "gsc compiler", nullptr, compiler); - ADD_TOOL("gscc_pack", "gsc", " [vm] [plt]", "pack required opcode for a vm", nullptr, gscc_pack); + ADD_TOOL(gscc, "gsc", " --help", "gsc compiler", nullptr, compiler); + ADD_TOOL(gscc_pack, "gsc", " [vm] [plt]", "pack required opcode for a vm", nullptr, gscc_pack); } \ No newline at end of file diff --git a/src/acts/ddl/ddl.cpp b/src/acts/ddl/ddl.cpp index 8e74aa2..76376fe 100644 --- a/src/acts/ddl/ddl.cpp +++ b/src/acts/ddl/ddl.cpp @@ -735,4 +735,4 @@ namespace { } -ADD_TOOL("ddlcheck", "common", "", "ddl check", nullptr, ddlcheck); \ No newline at end of file +ADD_TOOL(ddlcheck, "common", "", "ddl check", nullptr, ddlcheck); \ No newline at end of file diff --git a/src/acts/mods/mods.cpp b/src/acts/mods/mods.cpp index e6da31f..8a4e846 100644 --- a/src/acts/mods/mods.cpp +++ b/src/acts/mods/mods.cpp @@ -59,4 +59,4 @@ int mod(Process& unused, int argc, const char* argv[]) { return md.m_func(argc, argv); } -ADD_TOOL("mod", "acts", " [modname] [options]", "mods", nullptr, mod); +ADD_TOOL(mod, "acts", " [modname] [options]", "mods", nullptr, mod); diff --git a/src/acts/tools/bo3/bo3.cpp b/src/acts/tools/bo3/bo3.cpp index e522b23..e1cedbd 100644 --- a/src/acts/tools/bo3/bo3.cpp +++ b/src/acts/tools/bo3/bo3.cpp @@ -125,4 +125,4 @@ namespace { return ret; } } -ADD_TOOL("injectbo3", "bo3", " (script) (replace)", "inject script (bo3)", L"BlackOps3.exe", injectbo3); \ No newline at end of file +ADD_TOOL(injectbo3, "bo3", " (script) (replace)", "inject script (bo3)", L"BlackOps3.exe", injectbo3); \ No newline at end of file diff --git a/src/acts/tools/bo3/dumpt7.cpp b/src/acts/tools/bo3/dumpt7.cpp index 16a3e76..92153f4 100644 --- a/src/acts/tools/bo3/dumpt7.cpp +++ b/src/acts/tools/bo3/dumpt7.cpp @@ -998,6 +998,6 @@ namespace { - ADD_TOOL("dpt7", "bo3", " [pool]", "Black Ops 3 dump pool", L"BlackOps3.exe", t7dp); - ADD_TOOL("wpst7", "bo3", " [output=scriptparsetree_t7]", "dump pooled scripts (bo3)", L"BlackOps3.exe", t7poolscripts); + ADD_TOOL(dpt7, "bo3", " [pool]", "Black Ops 3 dump pool", L"BlackOps3.exe", t7dp); + ADD_TOOL(wpst7, "bo3", " [output=scriptparsetree_t7]", "dump pooled scripts (bo3)", L"BlackOps3.exe", t7poolscripts); } diff --git a/src/acts/tools/bo6/bo6ps4.cpp b/src/acts/tools/bo6/bo6ps4.cpp index 1b94a39..1fc7228 100644 --- a/src/acts/tools/bo6/bo6ps4.cpp +++ b/src/acts/tools/bo6/bo6ps4.cpp @@ -1259,9 +1259,9 @@ namespace { if (c) tool::nui::SaveNextConfig(); } - ADD_TOOL("ps4cbufbo6", "dev", " [ip:port] [cmd]", "", nullptr, ps4cbufbo6); - ADD_TOOL("ps4dumpbo6", "dev", " [ip:port]", "", nullptr, ps4dumpbo6); - ADD_TOOL("ps4repbo6", "dev", " [ip:port] [file]", "", nullptr, ps4repbo6); - ADD_TOOL_UI("bo6_tools", L"BO6 PS4", Render, Update, Resize); - ADD_TOOL_NUI("bo6_tools", "BO6 PS4", bo6_tools); + ADD_TOOL(ps4cbufbo6, "dev", " [ip:port] [cmd]", "", nullptr, ps4cbufbo6); + ADD_TOOL(ps4dumpbo6, "dev", " [ip:port]", "", nullptr, ps4dumpbo6); + ADD_TOOL(ps4repbo6, "dev", " [ip:port] [file]", "", nullptr, ps4repbo6); + ADD_TOOL_UI(bo6_tools, L"BO6 PS4", Render, Update, Resize); + ADD_TOOL_NUI(bo6_tools, "BO6 PS4", bo6_tools); } diff --git a/src/acts/tools/coder/error_coder.cpp b/src/acts/tools/coder/error_coder.cpp index e32fe16..cf39a61 100644 --- a/src/acts/tools/coder/error_coder.cpp +++ b/src/acts/tools/coder/error_coder.cpp @@ -2047,8 +2047,8 @@ namespace { ImGui::InputText("Decoded", decodeOutput, sizeof(decodeOutput), ImGuiInputTextFlags_ReadOnly); } } -ADD_TOOL_UI("errenc", L"T8/9 Error encoder", Render, Update, Resize); -ADD_TOOL_NUI("errenc", "T8/9 Error", errenc_nui); +ADD_TOOL_UI(errenc, L"T8/9 Error encoder", Render, Update, Resize); +ADD_TOOL_NUI(errenc, "T8/9 Error", errenc_nui); -ADD_TOOL("errenc", "hash", "[error]", "encode an error", nullptr, errenc); -ADD_TOOL("errdec", "hash", "[w1] [w2] [w3] [w4]", "decode an error", nullptr, errdec); \ No newline at end of file +ADD_TOOL(errenc, "hash", "[error]", "encode an error", nullptr, errenc); +ADD_TOOL(errdec, "hash", "[w1] [w2] [w3] [w4]", "decode an error", nullptr, errdec); \ No newline at end of file diff --git a/src/acts/tools/compatibility/dbf_gen.cpp b/src/acts/tools/compatibility/dbf_gen.cpp index 1f363b4..589f3f3 100644 --- a/src/acts/tools/compatibility/dbf_gen.cpp +++ b/src/acts/tools/compatibility/dbf_gen.cpp @@ -616,6 +616,6 @@ namespace { return tool::OK; } - ADD_TOOL("dbfgen", "compatibility", " (in) (out)", "Gen dynamic file", nullptr, dbfgen); - ADD_TOOL("dbfread", "compatibility", " (out)", "Read dynamic file", nullptr, dbfread); + ADD_TOOL(dbfgen, "compatibility", " (in) (out)", "Gen dynamic file", nullptr, dbfgen); + ADD_TOOL(dbfread, "compatibility", " (out)", "Read dynamic file", nullptr, dbfread); } \ No newline at end of file diff --git a/src/acts/tools/compatibility/scobalula_wnigen.cpp b/src/acts/tools/compatibility/scobalula_wnigen.cpp index 13b17a3..18cf112 100644 --- a/src/acts/tools/compatibility/scobalula_wnigen.cpp +++ b/src/acts/tools/compatibility/scobalula_wnigen.cpp @@ -177,6 +177,6 @@ namespace { return tool::OK; } - ADD_TOOL("wni_r", "compatibility", " [input] [output] [type=csv,txt]", "Read WNI file/dir", nullptr, wni_r); - ADD_TOOL("wni_gen", "compatibility", " [input] [output] [canon=false]", "Gen WNI file", nullptr, wni_gen); + ADD_TOOL(wni_r, "compatibility", " [input] [output] [type=csv,txt]", "Read WNI file/dir", nullptr, wni_r); + ADD_TOOL(wni_gen, "compatibility", " [input] [output] [canon=false]", "Gen WNI file", nullptr, wni_gen); } \ No newline at end of file diff --git a/src/acts/tools/compatibility/serious_db2gen.cpp b/src/acts/tools/compatibility/serious_db2gen.cpp index c9c0828..8f7b5d4 100644 --- a/src/acts/tools/compatibility/serious_db2gen.cpp +++ b/src/acts/tools/compatibility/serious_db2gen.cpp @@ -281,8 +281,8 @@ namespace { return tool::OK; } - ADD_TOOL("serious_db", "compatibility", " ([type] [vm])+", "Create a t7compiler database", nullptr, builddb); - ADD_TOOL("serious_dbd", "compatibility", " [database]", "Dump a t7compiler database", nullptr, dumpdb); - ADD_TOOL("serious_remap", "compatibility", " [database] [vm] [plt] [old] [new]", "Remap an opcode in a vm", nullptr, remapdb); + ADD_TOOL(serious_db, "compatibility", " ([type] [vm])+", "Create a t7compiler database", nullptr, builddb); + ADD_TOOL(serious_dbd, "compatibility", " [database]", "Dump a t7compiler database", nullptr, dumpdb); + ADD_TOOL(serious_remap, "compatibility", " [database] [vm] [plt] [old] [new]", "Remap an opcode in a vm", nullptr, remapdb); } diff --git a/src/acts/tools/compatibility/serious_fakedb2gen.cpp b/src/acts/tools/compatibility/serious_fakedb2gen.cpp index 981aadd..84e8fb8 100644 --- a/src/acts/tools/compatibility/serious_fakedb2gen.cpp +++ b/src/acts/tools/compatibility/serious_fakedb2gen.cpp @@ -124,6 +124,6 @@ namespace { return tool::OK; } - ADD_TOOL("serious_fake_db", "compatibility", " [type] [vm]", "Create a FAKE t7compiler database", nullptr, fakedb); + ADD_TOOL(serious_fake_db, "compatibility", " [type] [vm]", "Create a FAKE t7compiler database", nullptr, fakedb); } diff --git a/src/acts/tools/compatibility/serious_opcodes.cpp b/src/acts/tools/compatibility/serious_opcodes.cpp index 7ccf272..2127c03 100644 --- a/src/acts/tools/compatibility/serious_opcodes.cpp +++ b/src/acts/tools/compatibility/serious_opcodes.cpp @@ -107,6 +107,6 @@ namespace { return tool::OK; } - ADD_TOOL("serious_opcodes_read", "compatibility", " [file] [out]", "Dump opcodes file", nullptr, serious_opcodes_read); - ADD_TOOL("serious_opcodes_write", "compatibility", " [out] [vm] [plt]", "Create opcodes file", nullptr, serious_opcodes_write); + ADD_TOOL(serious_opcodes_read, "compatibility", " [file] [out]", "Dump opcodes file", nullptr, serious_opcodes_read); + ADD_TOOL(serious_opcodes_write, "compatibility", " [out] [vm] [plt]", "Create opcodes file", nullptr, serious_opcodes_write); } \ No newline at end of file diff --git a/src/acts/tools/console_ui.cpp b/src/acts/tools/console_ui.cpp index 4c086cf..7cf390d 100644 --- a/src/acts/tools/console_ui.cpp +++ b/src/acts/tools/console_ui.cpp @@ -81,5 +81,5 @@ namespace tool::console_ui { } - ADD_TOOL_NUI("zzzz7_console", "Console", console_ui); + ADD_TOOL_NUI(zzzz7_console, "Console", console_ui); } \ No newline at end of file diff --git a/src/acts/tools/cordycep_dump.cpp b/src/acts/tools/cordycep_dump.cpp index a3a8549..0c2fdd2 100644 --- a/src/acts/tools/cordycep_dump.cpp +++ b/src/acts/tools/cordycep_dump.cpp @@ -1584,6 +1584,6 @@ namespace tool::cordycep::dump { return ret; } } - ADD_TOOL("csid", "compatibility", "", "Dump csi info", nullptr, csi_test); - ADD_TOOL("dpcord", "common", "", "Cordycep dump tool", L"Cordycep.CLI.exe", dpcord); + ADD_TOOL(csid, "compatibility", "", "Dump csi info", nullptr, csi_test); + ADD_TOOL(dpcord, "common", "", "Cordycep dump tool", L"Cordycep.CLI.exe", dpcord); } \ No newline at end of file diff --git a/src/acts/tools/cw/cw.cpp b/src/acts/tools/cw/cw.cpp index 6792e92..084c0f9 100644 --- a/src/acts/tools/cw/cw.cpp +++ b/src/acts/tools/cw/cw.cpp @@ -925,16 +925,16 @@ namespace { } } -ADD_TOOL("cwdllgt", "cw", " [gametype] (map)", "set gametype", L"BlackOpsColdWar.exe", cwdllgt); -ADD_TOOL("cwdllac", "cw", " [action] (param str)", "run dll action", L"BlackOpsColdWar.exe", cwdllac); +ADD_TOOL(cwdllgt, "cw", " [gametype] (map)", "set gametype", L"BlackOpsColdWar.exe", cwdllgt); +ADD_TOOL(cwdllac, "cw", " [action] (param str)", "run dll action", L"BlackOpsColdWar.exe", cwdllac); #ifndef CI_BUILD -ADD_TOOL("tcrccw", "cw", "", "test crc (cw)", nullptr, cwtestchecksum); -ADD_TOOL("rawdecryptcw", "cw", "", " raw decrypt (cw)", nullptr, rawdecryptcw); +ADD_TOOL(tcrccw, "cw", "", "test crc (cw)", nullptr, cwtestchecksum); +ADD_TOOL(rawdecryptcw, "cw", "", " raw decrypt (cw)", nullptr, rawdecryptcw); -ADD_TOOL("ps4_dpcw100", "cw", " [ip:port]", "dump ps4 scripts (CW)", nullptr, ps4reader100); -ADD_TOOL("ps4_vtcw100", "cw", " [ip:port]", "dump ps4 vtable (CW)", nullptr, ps4vtable100); -ADD_TOOL("ps4_sm100", "cw", " [ip:port] [mode=0,1,2,3]", "set mode (CW)", nullptr, ps4setmode100); +ADD_TOOL(ps4_dpcw100, "cw", " [ip:port]", "dump ps4 scripts (CW)", nullptr, ps4reader100); +ADD_TOOL(ps4_vtcw100, "cw", " [ip:port]", "dump ps4 vtable (CW)", nullptr, ps4vtable100); +ADD_TOOL(ps4_sm100, "cw", " [ip:port] [mode=0,1,2,3]", "set mode (CW)", nullptr, ps4setmode100); #endif \ No newline at end of file diff --git a/src/acts/tools/cw/decrypt.cpp b/src/acts/tools/cw/decrypt.cpp index e64feca..263f238 100644 --- a/src/acts/tools/cw/decrypt.cpp +++ b/src/acts/tools/cw/decrypt.cpp @@ -88,6 +88,6 @@ namespace { } #ifndef CI_BUILD -ADD_TOOL("cwdecrypt", "cw", "", "decrypt tests", nullptr, cwdecrypt); +ADD_TOOL(cwdecrypt, "cw", "", "decrypt tests", nullptr, cwdecrypt); #endif \ No newline at end of file diff --git a/src/acts/tools/cw/poolt9.cpp b/src/acts/tools/cw/poolt9.cpp index 205ef8c..6fc4580 100644 --- a/src/acts/tools/cw/poolt9.cpp +++ b/src/acts/tools/cw/poolt9.cpp @@ -1582,13 +1582,13 @@ namespace { } using namespace cw::pool; - ADD_TOOL("dpcw", "cw", " [input=pool_name] (output=pool_id)", "Black Ops Cold War dump pool", L"BlackOpsColdWar.exe", pooltool); - ADD_TOOL("wpscw", "cw", "", "write pooled scripts (cw)", L"BlackOpsColdWar.exe", dumppoolcw); - ADD_TOOL("dpncw", "cw", "", "dump pool names (cw)", L"BlackOpsColdWar.exe", dpnamescw); - ADD_TOOL("dfuncscw", "cw", "", "dump function names (cw)", L"BlackOpsColdWar.exe", dfuncscw); - ADD_TOOL("dcfuncscw", "cw", "", "dump cmd names (cw)", L"BlackOpsColdWar.exe", dcfuncscw); - ADD_TOOL("dbgcw", "cw", " [inst]", "dbg (cw)", L"BlackOpsColdWar.exe", dbgcw); - ADD_TOOL("injectcw", "cw", " (script) (target) (replace)", "inject script (cw)", L"BlackOpsColdWar.exe", injectcw); - ADD_TOOL("injectcwalpha", "cw", " (script) (target) (replace)", "inject script (cw alpha)", L"COD2020.exe", injectcwalpha); - ADD_TOOL("dbgpcw", "cw", "", "dump bg pool (cw)", L"BlackOpsColdWar.exe", dbgp); + ADD_TOOL(dpcw, "cw", " [input=pool_name] (output=pool_id)", "Black Ops Cold War dump pool", L"BlackOpsColdWar.exe", pooltool); + ADD_TOOL(wpscw, "cw", "", "write pooled scripts (cw)", L"BlackOpsColdWar.exe", dumppoolcw); + ADD_TOOL(dpncw, "cw", "", "dump pool names (cw)", L"BlackOpsColdWar.exe", dpnamescw); + ADD_TOOL(dfuncscw, "cw", "", "dump function names (cw)", L"BlackOpsColdWar.exe", dfuncscw); + ADD_TOOL(dcfuncscw, "cw", "", "dump cmd names (cw)", L"BlackOpsColdWar.exe", dcfuncscw); + ADD_TOOL(dbgcw, "cw", " [inst]", "dbg (cw)", L"BlackOpsColdWar.exe", dbgcw); + ADD_TOOL(injectcw, "cw", " (script) (target) (replace)", "inject script (cw)", L"BlackOpsColdWar.exe", injectcw); + ADD_TOOL(injectcwalpha, "cw", " (script) (target) (replace)", "inject script (cw alpha)", L"COD2020.exe", injectcwalpha); + ADD_TOOL(dbgpcw, "cw", "", "dump bg pool (cw)", L"BlackOpsColdWar.exe", dbgp); } \ No newline at end of file diff --git a/src/acts/tools/dump.cpp b/src/acts/tools/dump.cpp index a2ee15f..34f4182 100644 --- a/src/acts/tools/dump.cpp +++ b/src/acts/tools/dump.cpp @@ -2103,15 +2103,15 @@ namespace { } } -ADD_TOOL("dps", "bo4", " [output=pool.csv]", "dump pooled scripts", L"BlackOps4.exe", poolscripts); -ADD_TOOL("ddv", "bo4", " [output=dvars.csv]", "dump dvars", L"BlackOps4.exe", dumpdvars); -ADD_TOOL("wpsbo4", "bo4", " [output=scriptparsetree]", "write pooled scripts", L"BlackOps4.exe", writepoolscripts); -ADD_TOOL("wef", "bo4", " [output=efields.csv]", "write ent fields", L"BlackOps4.exe", wef); -ADD_TOOL("dls", "bo4", " [output=linked.csv]", "dump linked scripts", L"BlackOps4.exe", linkedscripts); -ADD_TOOL("dfunc", "bo4", " [output=funcs.csv]", "dump functions", L"BlackOps4.exe", dumpfunctions); -ADD_TOOL("devents", "bo4", " [output=events.csv]", "dump registered instance events", L"BlackOps4.exe", events); -ADD_TOOL("dcfunc", "bo4", " [output=cfuncs.csv]", "dump cmd functions", L"BlackOps4.exe", dumpcmdfunctions); -ADD_TOOL("dscfunc", "bo4", " [output=csfuncs.csv]", "dump sv cmd functions", L"BlackOps4.exe", dumpsvcmdfunctions); -ADD_TOOL("dfields", "bo4", " [output=dfields.csv]", "dump class fields", L"BlackOps4.exe", dfields); -ADD_TOOL("dcm", "bo4", " [output=gfxworld.json]", "dump gfx world", L"BlackOps4.exe", dcm); -ADD_TOOL("dstorage", "bo4", " [output=storage.json]", "dump storage", L"BlackOps4.exe", dstorage); +ADD_TOOL(dps, "bo4", " [output=pool.csv]", "dump pooled scripts", L"BlackOps4.exe", poolscripts); +ADD_TOOL(ddv, "bo4", " [output=dvars.csv]", "dump dvars", L"BlackOps4.exe", dumpdvars); +ADD_TOOL(wpsbo4, "bo4", " [output=scriptparsetree]", "write pooled scripts", L"BlackOps4.exe", writepoolscripts); +ADD_TOOL(wef, "bo4", " [output=efields.csv]", "write ent fields", L"BlackOps4.exe", wef); +ADD_TOOL(dls, "bo4", " [output=linked.csv]", "dump linked scripts", L"BlackOps4.exe", linkedscripts); +ADD_TOOL(dfunc, "bo4", " [output=funcs.csv]", "dump functions", L"BlackOps4.exe", dumpfunctions); +ADD_TOOL(devents, "bo4", " [output=events.csv]", "dump registered instance events", L"BlackOps4.exe", events); +ADD_TOOL(dcfunc, "bo4", " [output=cfuncs.csv]", "dump cmd functions", L"BlackOps4.exe", dumpcmdfunctions); +ADD_TOOL(dscfunc, "bo4", " [output=csfuncs.csv]", "dump sv cmd functions", L"BlackOps4.exe", dumpsvcmdfunctions); +ADD_TOOL(dfields, "bo4", " [output=dfields.csv]", "dump class fields", L"BlackOps4.exe", dfields); +ADD_TOOL(dcm, "bo4", " [output=gfxworld.json]", "dump gfx world", L"BlackOps4.exe", dcm); +ADD_TOOL(dstorage, "bo4", " [output=storage.json]", "dump storage", L"BlackOps4.exe", dstorage); diff --git a/src/acts/tools/fastfiles.cpp b/src/acts/tools/fastfiles.cpp index c6933d9..44abe54 100644 --- a/src/acts/tools/fastfiles.cpp +++ b/src/acts/tools/fastfiles.cpp @@ -348,10 +348,10 @@ namespace { #ifndef CI_BUILD -ADD_TOOL("fftest", "fastfile", " [ff]", "test fastfile", nullptr, fftest); -ADD_TOOL("casctest", "fastfile", " [path]", "test casc", nullptr, casctest); -ADD_TOOL("h32ck", "fastfile", " [path]", "hash checksum", nullptr, h32ck); -ADD_TOOL("daes", "bo4", "", "dump AES keys", L"BlackOps4.exe", ffdaes); -ADD_TOOL("daes_local", "bo4", "", "dump AES acts keys", nullptr, daes_local); +ADD_TOOL(fftest, "fastfile", " [ff]", "test fastfile", nullptr, fftest); +ADD_TOOL(casctest, "fastfile", " [path]", "test casc", nullptr, casctest); +ADD_TOOL(h32ck, "fastfile", " [path]", "hash checksum", nullptr, h32ck); +ADD_TOOL(daes, "bo4", "", "dump AES keys", L"BlackOps4.exe", ffdaes); +ADD_TOOL(daes_local, "bo4", "", "dump AES acts keys", nullptr, daes_local); #endif \ No newline at end of file diff --git a/src/acts/tools/gsc.cpp b/src/acts/tools/gsc.cpp index c9383ce..2b858cd 100644 --- a/src/acts/tools/gsc.cpp +++ b/src/acts/tools/gsc.cpp @@ -3302,6 +3302,6 @@ static int gscd(Process& proc, int argc, const char* argv[]) { return gscinfo(proc, argc, argv); } -ADD_TOOL("gscinfo", "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscinfo); -ADD_TOOL("gscd", "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscd); -ADD_TOOL("dds", "gsc", " [input=scriptparsetree] [output=dataset.csv]", "dump dataset from gscinfo", nullptr, dumpdataset); +ADD_TOOL(gscinfo, "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscinfo); +ADD_TOOL(gscd, "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscd); +ADD_TOOL(dds, "gsc", " [input=scriptparsetree] [output=dataset.csv]", "dump dataset from gscinfo", nullptr, dumpdataset); diff --git a/src/acts/tools/gsc_demo.cpp b/src/acts/tools/gsc_demo.cpp index 595c844..24ffdca 100644 --- a/src/acts/tools/gsc_demo.cpp +++ b/src/acts/tools/gsc_demo.cpp @@ -192,6 +192,6 @@ namespace { #ifndef CI_BUILD -ADD_TOOL("gscdemo", "dev", "", "", nullptr, gscdemo); +ADD_TOOL(gscdemo, "dev", "", "", nullptr, gscdemo); #endif \ No newline at end of file diff --git a/src/acts/tools/gsc_gdb.cpp b/src/acts/tools/gsc_gdb.cpp index bb7bdb9..0d63e00 100644 --- a/src/acts/tools/gsc_gdb.cpp +++ b/src/acts/tools/gsc_gdb.cpp @@ -387,6 +387,6 @@ namespace tool::gsc::gdb { } - ADD_TOOL("gscgdbd", "gsc", "", "decompile GSC GDB file", nullptr, gscgdbinfo); - ADD_TOOL("gscgdbc", "gsc", " [dir]", "compile GSC GDB file", nullptr, gscgdbc); + ADD_TOOL(gscgdbd, "gsc", "", "decompile GSC GDB file", nullptr, gscgdbinfo); + ADD_TOOL(gscgdbc, "gsc", " [dir]", "compile GSC GDB file", nullptr, gscgdbc); } \ No newline at end of file diff --git a/src/acts/tools/gsc_hookmap.cpp b/src/acts/tools/gsc_hookmap.cpp index 42d7e30..49f70f4 100644 --- a/src/acts/tools/gsc_hookmap.cpp +++ b/src/acts/tools/gsc_hookmap.cpp @@ -372,8 +372,8 @@ namespace { return tool::OK; } - ADD_TOOL("gschook", "gsc", " [base] [dump]", "find all the linked functions of a script from a dump", nullptr, gschook); + ADD_TOOL(gschook, "gsc", " [base] [dump]", "find all the linked functions of a script from a dump", nullptr, gschook); #ifndef CI_BUILD - ADD_TOOL("gsclerr", "gsc", " [dump]", "find all the link errors in a gsc dump", nullptr, gsclerr); + ADD_TOOL(gsclerr, "gsc", " [dump]", "find all the link errors in a gsc dump", nullptr, gsclerr); #endif } diff --git a/src/acts/tools/gsc_injector_ui.cpp b/src/acts/tools/gsc_injector_ui.cpp index 6223861..ec11e59 100644 --- a/src/acts/tools/gsc_injector_ui.cpp +++ b/src/acts/tools/gsc_injector_ui.cpp @@ -717,6 +717,6 @@ namespace { if (c) tool::nui::SaveNextConfig(); } - ADD_TOOL_UI("gsc_inject", L"GSC Inject", Render, Update, Resize); - ADD_TOOL_NUI("gsc_inject", "GSC Inject", gsc_inject); + ADD_TOOL_UI(gsc_inject, L"GSC Inject", Render, Update, Resize); + ADD_TOOL_NUI(gsc_inject, "GSC Inject", gsc_inject); } \ No newline at end of file diff --git a/src/acts/tools/gsc_merge.cpp b/src/acts/tools/gsc_merge.cpp index ce4efc5..a52e841 100644 --- a/src/acts/tools/gsc_merge.cpp +++ b/src/acts/tools/gsc_merge.cpp @@ -116,7 +116,7 @@ namespace { #ifndef CI_BUILD -ADD_TOOL("gscmerge", "gsc", "[output] [files]+", "merge GSC files", nullptr, gscmerge); +ADD_TOOL(gscmerge, "gsc", "[output] [files]+", "merge GSC files", nullptr, gscmerge); #endif diff --git a/src/acts/tools/gsc_opcodes_load.cpp b/src/acts/tools/gsc_opcodes_load.cpp index cb23ade..00d1527 100644 --- a/src/acts/tools/gsc_opcodes_load.cpp +++ b/src/acts/tools/gsc_opcodes_load.cpp @@ -2138,8 +2138,8 @@ namespace tool::gsc::opcode { return tool::OK; } - ADD_TOOL("opcodetest", "dev", "", "test opcodes names lookup", nullptr, opcodetest); + ADD_TOOL(opcodetest, "dev", "", "test opcodes names lookup", nullptr, opcodetest); #endif - ADD_TOOL("dop", "dev", " [file=opcodes.actsop]", "dump opcodes", nullptr, dop); + ADD_TOOL(dop, "dev", " [file=opcodes.actsop]", "dump opcodes", nullptr, dop); } \ No newline at end of file diff --git a/src/acts/tools/hash.cpp b/src/acts/tools/hash.cpp index a976e9e..a26ee34 100644 --- a/src/acts/tools/hash.cpp +++ b/src/acts/tools/hash.cpp @@ -1262,20 +1262,20 @@ namespace { } -ADD_TOOL_UI("hash", L"Hash", Render, Update, Resize); -ADD_TOOL_NUI("hash", "Hash", hash_nui); -ADD_TOOL_NUI("hashsearch", "Searcher", hashsearch_nui); - -ADD_TOOL("lookup", "hash", " (string)*", "lookup strings", nullptr, lookuptool); -ADD_TOOL("expand_gen", "hash", " [count]", "expand test", nullptr, expand_gen); -ADD_TOOL("h32", "hash", " (string)*", "hash strings", nullptr, hash32); -ADD_TOOL("h64", "hash", " (string)*", "hash strings", nullptr, hash64); -ADD_TOOL("ht7", "hash", " (string)*", "hash strings", nullptr, hasht7); -ADD_TOOL("httest", "hash", " (string)*", "hash strings", nullptr, httest); -ADD_TOOL("fnv1acrack", "hash", " [string] [hash] [iv]", "crack fnv1a key, base iv: 100000001b3, 10000000233", nullptr, fnv1acrack); -ADD_TOOL("fnv1acrack2", "hash", " [csv] [iv]", "crack fnv1a key (one key based)", nullptr, fnv1acrack2); -ADD_TOOL("fnv1acrack3", "hash", " [csv] [iv]", "crack fnv1a keys (first char based)", nullptr, fnv1acrack3); -ADD_TOOL("str", "hash", "", "check collisions in the string file", nullptr, collisiontool); +ADD_TOOL_UI(hash, L"Hash", Render, Update, Resize); +ADD_TOOL_NUI(hash, "Hash", hash_nui); +ADD_TOOL_NUI(hashsearch, "Searcher", hashsearch_nui); + +ADD_TOOL(lookup, "hash", " (string)*", "lookup strings", nullptr, lookuptool); +ADD_TOOL(expand_gen, "hash", " [count]", "expand test", nullptr, expand_gen); +ADD_TOOL(h32, "hash", " (string)*", "hash strings", nullptr, hash32); +ADD_TOOL(h64, "hash", " (string)*", "hash strings", nullptr, hash64); +ADD_TOOL(ht7, "hash", " (string)*", "hash strings", nullptr, hasht7); +ADD_TOOL(httest, "hash", " (string)*", "hash strings", nullptr, httest); +ADD_TOOL(fnv1acrack, "hash", " [string] [hash] [iv]", "crack fnv1a key, base iv: 100000001b3, 10000000233", nullptr, fnv1acrack); +ADD_TOOL(fnv1acrack2, "hash", " [csv] [iv]", "crack fnv1a key (one key based)", nullptr, fnv1acrack2); +ADD_TOOL(fnv1acrack3, "hash", " [csv] [iv]", "crack fnv1a keys (first char based)", nullptr, fnv1acrack3); +ADD_TOOL(str, "hash", "", "check collisions in the string file", nullptr, collisiontool); #ifndef CI_BUILD -ADD_TOOL("fakefnvds", "hash", " [csv] [key] [iv]", "gen fake fnv1a dataset", nullptr, fakefnvds); +ADD_TOOL(fakefnvds, "hash", " [csv] [key] [iv]", "gen fake fnv1a dataset", nullptr, fakefnvds); #endif diff --git a/src/acts/tools/hashes/compiled_files.cpp b/src/acts/tools/hashes/compiled_files.cpp index 39c1d50..9cf36ee 100644 --- a/src/acts/tools/hashes/compiled_files.cpp +++ b/src/acts/tools/hashes/compiled_files.cpp @@ -135,6 +135,6 @@ namespace { return tool::OK; } - ADD_TOOL("cfd", "hash", " [dir] (output)", "decompile raw compiled file (.cf)", nullptr, cfd); + ADD_TOOL(cfd, "hash", " [dir] (output)", "decompile raw compiled file (.cf)", nullptr, cfd); } \ No newline at end of file diff --git a/src/acts/tools/hashes/hash_scanner.cpp b/src/acts/tools/hashes/hash_scanner.cpp index 8c1443f..008835d 100644 --- a/src/acts/tools/hashes/hash_scanner.cpp +++ b/src/acts/tools/hashes/hash_scanner.cpp @@ -417,9 +417,9 @@ namespace tool::hash::scanner { return tool::OK; } - ADD_TOOL("hashscan", "hash", " [dir] [output]", "scan hashes in a directory", nullptr, hashscan); - ADD_TOOL("hashbrute", "hash", " [dir] [output] (prefix) (suffix)", "brute search hashes in a directory", nullptr, hashbrute); - ADD_TOOL("hashbrutedict", "hash", " [dir] [output] [dict] (prefix) (suffix)", "brute search hashes in a directory with dictionary", nullptr, hashbrutedict); + ADD_TOOL(hashscan, "hash", " [dir] [output]", "scan hashes in a directory", nullptr, hashscan); + ADD_TOOL(hashbrute, "hash", " [dir] [output] (prefix) (suffix)", "brute search hashes in a directory", nullptr, hashbrute); + ADD_TOOL(hashbrutedict, "hash", " [dir] [output] [dict] (prefix) (suffix)", "brute search hashes in a directory with dictionary", nullptr, hashbrutedict); } diff --git a/src/acts/tools/hashes/searcher.cpp b/src/acts/tools/hashes/searcher.cpp index 27acd9a..6ac8be6 100644 --- a/src/acts/tools/hashes/searcher.cpp +++ b/src/acts/tools/hashes/searcher.cpp @@ -35,6 +35,6 @@ namespace { return tool::OK; } - ADD_TOOL("hashsearcher", "hash", " [file] [output]", "search in hash file", nullptr, hashsearcher); + ADD_TOOL(hashsearcher, "hash", " [file] [output]", "search in hash file", nullptr, hashsearcher); } \ No newline at end of file diff --git a/src/acts/tools/lib/actslibtest.cpp b/src/acts/tools/lib/actslibtest.cpp index 9f68e2e..a76aebc 100644 --- a/src/acts/tools/lib/actslibtest.cpp +++ b/src/acts/tools/lib/actslibtest.cpp @@ -473,7 +473,7 @@ namespace { } #ifndef CI_BUILD -ADD_TOOL("actslibtest", "lib", "", "Acts lib test", nullptr, actslibtest); +ADD_TOOL(actslibtest, "lib", "", "Acts lib test", nullptr, actslibtest); #endif -ADD_TOOL("actslibprofiler", "lib", " [profile file]", "Read profiler", nullptr, actslibprofiler); \ No newline at end of file +ADD_TOOL(actslibprofiler, "lib", " [profile file]", "Read profiler", nullptr, actslibprofiler); \ No newline at end of file diff --git a/src/acts/tools/lua.cpp b/src/acts/tools/lua.cpp index ff87cc1..073fcb3 100644 --- a/src/acts/tools/lua.cpp +++ b/src/acts/tools/lua.cpp @@ -688,5 +688,5 @@ namespace tool::lua { return tool::OK; } - ADD_TOOL("luad", "lua", " [file]", "Lua Havok Script", nullptr, hks_bytecode); + ADD_TOOL(luad, "lua", " [file]", "Lua Havok Script", nullptr, hks_bytecode); } diff --git a/src/acts/tools/lui.cpp b/src/acts/tools/lui.cpp index 674fd03..70e823f 100644 --- a/src/acts/tools/lui.cpp +++ b/src/acts/tools/lui.cpp @@ -56,4 +56,4 @@ namespace { } -ADD_TOOL("dluif", "bo4", "", "dump lui cfunc", L"BlackOps4.exe", dump_luifuncs); \ No newline at end of file +ADD_TOOL(dluif, "bo4", "", "dump lui cfunc", L"BlackOps4.exe", dump_luifuncs); \ No newline at end of file diff --git a/src/acts/tools/nui/test_renderer.cpp b/src/acts/tools/nui/test_renderer.cpp index 4349b6d..0701384 100644 --- a/src/acts/tools/nui/test_renderer.cpp +++ b/src/acts/tools/nui/test_renderer.cpp @@ -266,5 +266,5 @@ namespace { } - ADD_TOOL_NUI2_DEV("render_test", "Renderer test", render_test_setup, render_test); + ADD_TOOL_NUI2_DEV(render_test, "Renderer test", render_test_setup, render_test); } \ No newline at end of file diff --git a/src/acts/tools/pool.cpp b/src/acts/tools/pool.cpp index 874b476..176de1a 100644 --- a/src/acts/tools/pool.cpp +++ b/src/acts/tools/pool.cpp @@ -6415,8 +6415,8 @@ int dbgp(Process& proc, int argc, const char* argv[]) { return tool::OK; } -ADD_TOOL("dpbo4", "bo4", " [pool]+", "Black Ops 4 dump pool", L"BlackOps4.exe", pooltool); -ADD_TOOL("dpn", "bo4", "", "dump pool names", L"BlackOps4.exe", pooltoolnames); -ADD_TOOL("dbgcache", "bo4", "", "dump bg cache", L"BlackOps4.exe", dumpbgcache); -ADD_TOOL("dbmtstrs", "bo4", "", "dump mt strings", L"BlackOps4.exe", dbmtstrs); -ADD_TOOL("dbgpbo4", "bo4", "", "dump bg pool", L"BlackOps4.exe", dbgp); +ADD_TOOL(dpbo4, "bo4", " [pool]+", "Black Ops 4 dump pool", L"BlackOps4.exe", pooltool); +ADD_TOOL(dpn, "bo4", "", "dump pool names", L"BlackOps4.exe", pooltoolnames); +ADD_TOOL(dbgcache, "bo4", "", "dump bg cache", L"BlackOps4.exe", dumpbgcache); +ADD_TOOL(dbmtstrs, "bo4", "", "dump mt strings", L"BlackOps4.exe", dbmtstrs); +ADD_TOOL(dbgpbo4, "bo4", "", "dump bg pool", L"BlackOps4.exe", dbgp); diff --git a/src/acts/tools/process.cpp b/src/acts/tools/process.cpp index a1a1306..a89b86b 100644 --- a/src/acts/tools/process.cpp +++ b/src/acts/tools/process.cpp @@ -455,7 +455,7 @@ namespace { } #ifndef CI_BUILD -ADD_TOOL("crashproc", "dev", "", "", nullptr, crashproc); -ADD_TOOL("procloop", "dev", "", "proc loop", nullptr, procloop); +ADD_TOOL(crashproc, "dev", "", "", nullptr, crashproc); +ADD_TOOL(procloop, "dev", "", "proc loop", nullptr, procloop); #endif -ADD_TOOL("proc", "dev", " (process) (s) [module] [function]", "process explorer", nullptr, processtool); \ No newline at end of file +ADD_TOOL(proc, "dev", " (process) (s) [module] [function]", "process explorer", nullptr, processtool); \ No newline at end of file diff --git a/src/acts/tools/ps4inject.cpp b/src/acts/tools/ps4inject.cpp index 9d54f3c..b67e72c 100644 --- a/src/acts/tools/ps4inject.cpp +++ b/src/acts/tools/ps4inject.cpp @@ -540,6 +540,6 @@ namespace { } } -ADD_TOOL("ps4_t8cee", "bo4", " [ip:port]", "Enable EEs in custom mutation/offline/casual (BO4 / PS4 126)", nullptr, ps4t8cee); -ADD_TOOL("ps4_inject", "bo4", " [ip:port] [script] [target] [replaced]", "Inject script (BO4 / PS4 126)", nullptr, ps4inject); -ADD_TOOL("ps4_injectcw100", "cw", " [ip:port] [script] [target] [replaced]", "Inject script (CW / PS4 100)", nullptr, ps4injectcw100); \ No newline at end of file +ADD_TOOL(ps4_t8cee, "bo4", " [ip:port]", "Enable EEs in custom mutation/offline/casual (BO4 / PS4 126)", nullptr, ps4t8cee); +ADD_TOOL(ps4_inject, "bo4", " [ip:port] [script] [target] [replaced]", "Inject script (BO4 / PS4 126)", nullptr, ps4inject); +ADD_TOOL(ps4_injectcw100, "cw", " [ip:port] [script] [target] [replaced]", "Inject script (CW / PS4 100)", nullptr, ps4injectcw100); \ No newline at end of file diff --git a/src/acts/tools/ps4reader.cpp b/src/acts/tools/ps4reader.cpp index 891b870..fb28f57 100644 --- a/src/acts/tools/ps4reader.cpp +++ b/src/acts/tools/ps4reader.cpp @@ -87,6 +87,6 @@ namespace { #ifndef CI_BUILD -ADD_TOOL("ps4r", "ps4", " [ip:port] [loc] [size]", "ps4reader", nullptr, ps4reader); +ADD_TOOL(ps4r, "ps4", " [ip:port] [loc] [size]", "ps4reader", nullptr, ps4reader); #endif \ No newline at end of file diff --git a/src/acts/tools/resolver.cpp b/src/acts/tools/resolver.cpp index fe260f4..daacdf6 100644 --- a/src/acts/tools/resolver.cpp +++ b/src/acts/tools/resolver.cpp @@ -253,4 +253,4 @@ static int resolver(Process& unused, int argc, const char* argv[]) { } -ADD_TOOL("resolver", "hash", " [cfg_file]", "hash resolver", nullptr, resolver); +ADD_TOOL(resolver, "hash", " [cfg_file]", "hash resolver", nullptr, resolver); diff --git a/src/acts/tools/rosetta.cpp b/src/acts/tools/rosetta.cpp index 0c887eb..5efa886 100644 --- a/src/acts/tools/rosetta.cpp +++ b/src/acts/tools/rosetta.cpp @@ -337,8 +337,8 @@ namespace { #ifndef CI_BUILD // removed from CI build to add some challenge to the skids -ADD_TOOL("rosetta", "gsc", " [rosetta_file] [compiled script dump]", "Compute the opcodes of a dump using a Rosetta file", nullptr, rosetta); -ADD_TOOL("gscfreq", "gsc", "", "Frequency of opcodes", nullptr, gscfreq); -ADD_TOOL("vtdr", "gsc", "", "VTable tests", nullptr, vtabledumread); +ADD_TOOL(rosetta, "gsc", " [rosetta_file] [compiled script dump]", "Compute the opcodes of a dump using a Rosetta file", nullptr, rosetta); +ADD_TOOL(gscfreq, "gsc", "", "Frequency of opcodes", nullptr, gscfreq); +ADD_TOOL(vtdr, "gsc", "", "VTable tests", nullptr, vtabledumread); #endif diff --git a/src/acts/tools/sp23/gscinfo.cpp b/src/acts/tools/sp23/gscinfo.cpp index 58ea37d..034fb18 100644 --- a/src/acts/tools/sp23/gscinfo.cpp +++ b/src/acts/tools/sp23/gscinfo.cpp @@ -703,4 +703,4 @@ namespace { } // use gscinfo for jup -//ADD_TOOL("gscinfo23", "mwiii", " [file]", "gsc info 23", nullptr, gscinfo); +//ADD_TOOL(gscinfo23, "mwiii", " [file]", "gsc info 23", nullptr, gscinfo); diff --git a/src/acts/tools/sp23/gsctools.cpp b/src/acts/tools/sp23/gsctools.cpp index 3b8a122..3b18aad 100644 --- a/src/acts/tools/sp23/gsctools.cpp +++ b/src/acts/tools/sp23/gsctools.cpp @@ -36,6 +36,6 @@ namespace { } #ifndef CI_BUILD - ADD_TOOL("gsctooltest", "mwiii", " [gsc file]", " tool test", nullptr, gsctooltest); + ADD_TOOL(gsctooltest, "mwiii", " [gsc file]", " tool test", nullptr, gsctooltest); #endif } \ No newline at end of file diff --git a/src/acts/tools/sp23/sp23.cpp b/src/acts/tools/sp23/sp23.cpp index fedfaf8..bb26c43 100644 --- a/src/acts/tools/sp23/sp23.cpp +++ b/src/acts/tools/sp23/sp23.cpp @@ -695,10 +695,10 @@ namespace sp23 { } } #ifndef CI_BUILD -ADD_TOOL("local23", "mwiii", " [file]", "decrypt local dump 23", nullptr, decryptlocalize); -ADD_TOOL("hash23search", "mwiii", " [file]", "", nullptr, hash23search); -ADD_TOOL("vmtest", "mwiii", "", "test vm opcodes", nullptr, vmtest);; -ADD_TOOL("strbytestest", "mwiii", "", "test strings", nullptr, strbytestest); +ADD_TOOL(local23, "mwiii", " [file]", "decrypt local dump 23", nullptr, decryptlocalize); +ADD_TOOL(hash23search, "mwiii", " [file]", "", nullptr, hash23search); +ADD_TOOL(vmtest, "mwiii", "", "test vm opcodes", nullptr, vmtest);; +ADD_TOOL(strbytestest, "mwiii", "", "test strings", nullptr, strbytestest); #endif -ADD_TOOL("hash23", "mwiii", " [str]", "hash using iw values", nullptr, hash23); +ADD_TOOL(hash23, "mwiii", " [str]", "hash using iw values", nullptr, hash23); diff --git a/src/acts/tools/test.cpp b/src/acts/tools/test.cpp index 34f3020..f6ada3c 100644 --- a/src/acts/tools/test.cpp +++ b/src/acts/tools/test.cpp @@ -75,8 +75,8 @@ namespace { } -ADD_TOOL("test", "dev", "", "Tests", nullptr, test); -ADD_TOOL("memalloctest", "dev", "", "Tests", nullptr, memalloctest); -ADD_TOOL("wget", "dev", " [url]", "Tests", nullptr, testurl); -ADD_TOOL("cfgtest", "dev", "", "", nullptr, cfgtest); +ADD_TOOL(test, "dev", "", "Tests", nullptr, test); +ADD_TOOL(memalloctest, "dev", "", "Tests", nullptr, memalloctest); +ADD_TOOL(wget, "dev", " [url]", "Tests", nullptr, testurl); +ADD_TOOL(cfgtest, "dev", "", "", nullptr, cfgtest); #endif \ No newline at end of file diff --git a/src/acts/tools/tools.cpp b/src/acts/tools/tools.cpp index b40a485..3555ef0 100644 --- a/src/acts/tools/tools.cpp +++ b/src/acts/tools/tools.cpp @@ -425,7 +425,7 @@ namespace { return tool::OK; } - ADD_TOOL("color", "dev", "", "color tool", nullptr, color); + ADD_TOOL(color, "dev", "", "color tool", nullptr, color); #endif int info(Process& proc, int argc, const char* argv[]) { LOG_INFO("Loading acts data..."); @@ -475,7 +475,7 @@ namespace { return tool::OK; } } -ADD_TOOL("list", "acts", "", "list all the tools", nullptr, list); -ADD_TOOL("help", "acts", "", "list all the tools", nullptr, help); -ADD_TOOL("info", "acts", "", "acts info", nullptr, info); -ADD_TOOL("search", "acts", " (args)*", "search a tool", nullptr, search); +ADD_TOOL(list, "acts", "", "list all the tools", nullptr, list); +ADD_TOOL(help, "acts", "", "list all the tools", nullptr, help); +ADD_TOOL(info, "acts", "", "acts info", nullptr, info); +ADD_TOOL(search, "acts", " (args)*", "search a tool", nullptr, search); diff --git a/src/acts/tools/tools.hpp b/src/acts/tools/tools.hpp index 56b28b6..b0c8a7a 100644 --- a/src/acts/tools/tools.hpp +++ b/src/acts/tools/tools.hpp @@ -47,4 +47,4 @@ namespace tool { void usage(const char* message, const char* argv0, alogs::loglevel lvl = alogs::loglevel::LVL_ERROR); } -#define ADD_TOOL(name, category, usage, desc, needGame, function) static tool::toolfunctiondata __toolfunctiondata_##function(name, category, usage, desc, needGame, function) +#define ADD_TOOL(id, category, usage, desc, needGame, function) static tool::toolfunctiondata __toolfunctiondata_##id(#id, category, usage, desc, needGame, function) diff --git a/src/acts/tools/tools_nui.cpp b/src/acts/tools/tools_nui.cpp index 03fb5bd..0e281d5 100644 --- a/src/acts/tools/tools_nui.cpp +++ b/src/acts/tools/tools_nui.cpp @@ -567,8 +567,8 @@ namespace tool::nui { ImGui::Text(txt.c_str()); } - ADD_TOOL("newui", "dev", "", "Launch new UI", nullptr, newui); - ADD_TOOL_NUI("aaaa_acts", "Atian Tools", acts); - ADD_TOOL_NUI("zzzz9_newui_cfg", "Config", newui_bg); + ADD_TOOL(newui, "dev", "", "Launch new UI", nullptr, newui); + ADD_TOOL_NUI(aaaa_acts, "Atian Tools", acts); + ADD_TOOL_NUI(zzzz9_newui_cfg, "Config", newui_bg); } } \ No newline at end of file diff --git a/src/acts/tools/tools_nui.hpp b/src/acts/tools/tools_nui.hpp index 6806fda..3b90b0f 100644 --- a/src/acts/tools/tools_nui.hpp +++ b/src/acts/tools/tools_nui.hpp @@ -100,7 +100,7 @@ namespace tool::nui { }; } -#define ADD_TOOL_NUI(id, desc, function) static tool::nui::tooluifunctiondata __tooluifunctiondata_##function(id, desc, nullptr, function, false) -#define ADD_TOOL_NUI2(id, desc, setup, function) static tool::nui::tooluifunctiondata __tooluifunctiondata_##function(id, desc, setup, function, false) -#define ADD_TOOL_NUI_DEV(id, desc, function) static tool::nui::tooluifunctiondata __tooluifunctiondata_##function(id, desc, nullptr, function, true) -#define ADD_TOOL_NUI2_DEV(id, desc, setup, function) static tool::nui::tooluifunctiondata __tooluifunctiondata_##function(id, desc, setup, function, true) \ No newline at end of file +#define ADD_TOOL_NUI(id, desc, function) static tool::nui::tooluifunctiondata __toolnuifunctiondata_##id(#id, desc, nullptr, function, false) +#define ADD_TOOL_NUI2(id, desc, setup, function) static tool::nui::tooluifunctiondata __toolnuifunctiondata_##id(#id, desc, setup, function, false) +#define ADD_TOOL_NUI_DEV(id, desc, function) static tool::nui::tooluifunctiondata __toolnuifunctiondata_##id(#id, desc, nullptr, function, true) +#define ADD_TOOL_NUI2_DEV(id, desc, setup, function) static tool::nui::tooluifunctiondata __toolnuifunctiondata_##id(#id, desc, setup, function, true) \ No newline at end of file diff --git a/src/acts/tools/tools_ui.cpp b/src/acts/tools/tools_ui.cpp index 85129d1..6a3447e 100644 --- a/src/acts/tools/tools_ui.cpp +++ b/src/acts/tools/tools_ui.cpp @@ -93,4 +93,4 @@ namespace { SetWindowPos(toolInfo.mainLabel, NULL, 8, 8, width - 8, height - 8, SWP_SHOWWINDOW); } } -ADD_TOOL_UI("acts", L"Atian Tools", RenderActs, UpdateActs, ResizeActs); \ No newline at end of file +ADD_TOOL_UI(acts, L"Atian Tools", RenderActs, UpdateActs, ResizeActs); \ No newline at end of file diff --git a/src/acts/tools/tools_ui.hpp b/src/acts/tools/tools_ui.hpp index 50226e0..436c3d6 100644 --- a/src/acts/tools/tools_ui.hpp +++ b/src/acts/tools/tools_ui.hpp @@ -49,4 +49,4 @@ namespace tool::ui { std::wstring GetWindowTextVal(HWND hwnd); std::wstring GetActsDesc(bool nui = false); } -#define ADD_TOOL_UI(id, desc, function, msg, resize) static tool::ui::tooluifunctiondata __tooluifunctiondata_##function(id, desc, function, msg, resize) \ No newline at end of file +#define ADD_TOOL_UI(id, desc, function, msg, resize) static tool::ui::tooluifunctiondata __tooluifunctiondata_##id(#id, desc, function, msg, resize) \ No newline at end of file diff --git a/src/acts/tools/unzip.cpp b/src/acts/tools/unzip.cpp index cc81eb9..470cf8e 100644 --- a/src/acts/tools/unzip.cpp +++ b/src/acts/tools/unzip.cpp @@ -40,5 +40,5 @@ static int resolver(Process& unused, int argc, const char* argv[]) { } #ifndef CI_BUILD -ADD_TOOL("zlib", "common", " [file]", "zlib extract", nullptr, resolver); +ADD_TOOL(zlib, "common", " [file]", "zlib extract", nullptr, resolver); #endif \ No newline at end of file diff --git a/src/acts/tools/vm_debug.cpp b/src/acts/tools/vm_debug.cpp index 8941f70..300f26d 100644 --- a/src/acts/tools/vm_debug.cpp +++ b/src/acts/tools/vm_debug.cpp @@ -846,5 +846,5 @@ namespace { } } -ADD_TOOL("dbg", "bo4", "", "vm debugger", L"BlackOps4.exe", vmdebug); -ADD_TOOL("dbg_link", "bo4", "", "debug linking error", L"BlackOps4.exe", vmdebuglink); +ADD_TOOL(dbg, "bo4", "", "vm debugger", L"BlackOps4.exe", vmdebug); +ADD_TOOL(dbg_link, "bo4", "", "debug linking error", L"BlackOps4.exe", vmdebuglink); diff --git a/src/acts/tools/weapons.cpp b/src/acts/tools/weapons.cpp index b632bc0..0d4277b 100644 --- a/src/acts/tools/weapons.cpp +++ b/src/acts/tools/weapons.cpp @@ -316,4 +316,4 @@ namespace { } -ADD_TOOL("wfd", "bo4", "", "Weapon field dump", L"BlackOps4.exe", wfdump); \ No newline at end of file +ADD_TOOL(wfd, "bo4", "", "Weapon field dump", L"BlackOps4.exe", wfdump); \ No newline at end of file