From af697a4460e14a5700ce538ceede9b58771601d6 Mon Sep 17 00:00:00 2001 From: ineed bots Date: Fri, 8 Sep 2023 15:15:17 -0600 Subject: [PATCH] defines --- .../decomp/clientscript/re_cscr_animtree.cpp | 4 +-- .../decomp/clientscript/re_cscr_compiler.cpp | 4 +-- .../decomp/clientscript/re_cscr_main.cpp | 6 ++--- .../clientscript/re_cscr_memorytree.cpp | 6 ++--- .../decomp/clientscript/re_cscr_parser.cpp | 6 ++--- .../decomp/clientscript/re_cscr_parsetree.cpp | 6 ++--- .../decomp/clientscript/re_cscr_readwrite.cpp | 6 ++--- .../clientscript/re_cscr_stringlist.cpp | 6 ++--- .../decomp/clientscript/re_cscr_variable.cpp | 6 ++--- .../decomp/clientscript/re_cscr_vm.cpp | 6 ++--- .../decomp/clientscript/re_cscr_yacc.cpp | 4 +-- src/game/game.hpp | 25 +++++++++++++++++++ 12 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/component/decomp/clientscript/re_cscr_animtree.cpp b/src/component/decomp/clientscript/re_cscr_animtree.cpp index 52d3129..b38e05d 100644 --- a/src/component/decomp/clientscript/re_cscr_animtree.cpp +++ b/src/component/decomp/clientscript/re_cscr_animtree.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" //#include "codsrc/clientscript/cscr_animtree.hpp" -#define RE_CSCR_ANIMTREE_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_YACC namespace re_cscr_animtree { utils::hook::detour AnimTreeCompileError_hook; @@ -398,3 +397,4 @@ namespace re_cscr_animtree }; } REGISTER_COMPONENT(re_cscr_animtree::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_compiler.cpp b/src/component/decomp/clientscript/re_cscr_compiler.cpp index 35d21c2..7f15316 100644 --- a/src/component/decomp/clientscript/re_cscr_compiler.cpp +++ b/src/component/decomp/clientscript/re_cscr_compiler.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" //#include "codsrc/clientscript/cscr_compiler.hpp" -#define RE_CSCR_COMPILER_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_COMPILER namespace re_cscr_compiler { utils::hook::detour RemoveRefToValue_hook; @@ -3327,3 +3326,4 @@ namespace re_cscr_compiler }; } REGISTER_COMPONENT(re_cscr_compiler::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_main.cpp b/src/component/decomp/clientscript/re_cscr_main.cpp index 259d722..67a2766 100644 --- a/src/component/decomp/clientscript/re_cscr_main.cpp +++ b/src/component/decomp/clientscript/re_cscr_main.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_main.hpp" -//#define RE_CSCR_MAIN_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_MAIN namespace re_cscr_main { utils::hook::detour Scr_IsIdentifier_hook; @@ -306,4 +305,5 @@ namespace re_cscr_main private: }; } -REGISTER_COMPONENT(re_cscr_main::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_main::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_memorytree.cpp b/src/component/decomp/clientscript/re_cscr_memorytree.cpp index 7182f39..1da5a77 100644 --- a/src/component/decomp/clientscript/re_cscr_memorytree.cpp +++ b/src/component/decomp/clientscript/re_cscr_memorytree.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_memorytree.hpp" -//#define RE_CSCR_MEMORYTREE_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_MEMORYTREE namespace re_cscr_memorytree { utils::hook::detour MT_GetSubTreeSize_hook; @@ -305,4 +304,5 @@ namespace re_cscr_memorytree private: }; } -REGISTER_COMPONENT(re_cscr_memorytree::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_memorytree::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_parser.cpp b/src/component/decomp/clientscript/re_cscr_parser.cpp index 4f890f0..936133c 100644 --- a/src/component/decomp/clientscript/re_cscr_parser.cpp +++ b/src/component/decomp/clientscript/re_cscr_parser.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_parser.hpp" -//#define RE_CSCR_PARSER_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_PARSER namespace re_cscr_parser { utils::hook::detour Scr_InitOpcodeLookup_hook; @@ -587,4 +586,5 @@ namespace re_cscr_parser private: }; } -REGISTER_COMPONENT(re_cscr_parser::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_parser::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_parsetree.cpp b/src/component/decomp/clientscript/re_cscr_parsetree.cpp index 6c63101..c636b74 100644 --- a/src/component/decomp/clientscript/re_cscr_parsetree.cpp +++ b/src/component/decomp/clientscript/re_cscr_parsetree.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_parsetree.hpp" -//#define RE_CSCR_PARSETREE_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_PARSETREE namespace re_cscr_parsetree { utils::hook::detour Scr_InitAllocNode_hook; @@ -194,4 +193,5 @@ namespace re_cscr_parsetree private: }; } -REGISTER_COMPONENT(re_cscr_parsetree::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_parsetree::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_readwrite.cpp b/src/component/decomp/clientscript/re_cscr_readwrite.cpp index 1758a66..021a83d 100644 --- a/src/component/decomp/clientscript/re_cscr_readwrite.cpp +++ b/src/component/decomp/clientscript/re_cscr_readwrite.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_readwrite.hpp" -//#define RE_CSCR_READWRITE_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_READWRITE namespace re_cscr_readwrite { utils::hook::detour FindVariableIndexInternal2_hook; @@ -76,4 +75,5 @@ namespace re_cscr_readwrite private: }; } -REGISTER_COMPONENT(re_cscr_readwrite::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_readwrite::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_stringlist.cpp b/src/component/decomp/clientscript/re_cscr_stringlist.cpp index 654f228..3d43ffb 100644 --- a/src/component/decomp/clientscript/re_cscr_stringlist.cpp +++ b/src/component/decomp/clientscript/re_cscr_stringlist.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_stringlist.hpp" -//#define RE_CSCR_STRINGLIST_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_STRINGLIST namespace re_cscr_stringlist { utils::hook::detour SL_ConvertToString_hook; @@ -649,4 +648,5 @@ namespace re_cscr_stringlist private: }; } -REGISTER_COMPONENT(re_cscr_stringlist::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_stringlist::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_variable.cpp b/src/component/decomp/clientscript/re_cscr_variable.cpp index ea7b851..fbd7b9e 100644 --- a/src/component/decomp/clientscript/re_cscr_variable.cpp +++ b/src/component/decomp/clientscript/re_cscr_variable.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_variable.hpp" -//#define RE_CSCR_VARIABLE_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_VARIABLE namespace re_cscr_variable { utils::hook::detour ThreadInfoCompare_hook; @@ -2506,4 +2505,5 @@ namespace re_cscr_variable private: }; } -REGISTER_COMPONENT(re_cscr_variable::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_variable::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_vm.cpp b/src/component/decomp/clientscript/re_cscr_vm.cpp index f8b0124..c4d770f 100644 --- a/src/component/decomp/clientscript/re_cscr_vm.cpp +++ b/src/component/decomp/clientscript/re_cscr_vm.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" #include "codsrc/clientscript/cscr_vm.hpp" -//#define RE_CSCR_VM_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_VM namespace re_cscr_vm { utils::hook::detour Scr_VM_Init_hook; @@ -1676,4 +1675,5 @@ namespace re_cscr_vm private: }; } -REGISTER_COMPONENT(re_cscr_vm::component) \ No newline at end of file +REGISTER_COMPONENT(re_cscr_vm::component) +#endif diff --git a/src/component/decomp/clientscript/re_cscr_yacc.cpp b/src/component/decomp/clientscript/re_cscr_yacc.cpp index 153e5f5..5d8a4e1 100644 --- a/src/component/decomp/clientscript/re_cscr_yacc.cpp +++ b/src/component/decomp/clientscript/re_cscr_yacc.cpp @@ -3,8 +3,7 @@ #include "utils/hook.hpp" //#include "codsrc/clientscript/cscr_yacc.hpp" -#define RE_CSCR_YACC_USE_WRAPPERS - +#ifndef DISABLE_RE_CSCR_YACC namespace re_cscr_yacc { utils::hook::detour LowerCase_hook; @@ -230,3 +229,4 @@ namespace re_cscr_yacc }; } REGISTER_COMPONENT(re_cscr_yacc::component) +#endif diff --git a/src/game/game.hpp b/src/game/game.hpp index f3ae068..8bf1ddf 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -20,6 +20,31 @@ } #endif + +#define RE_CSCR_ANIMTREE_USE_WRAPPERS +#define RE_CSCR_COMPILER_USE_WRAPPERS +//#define RE_CSCR_MAIN_USE_WRAPPERS +//#define RE_CSCR_MEMORYTREE_USE_WRAPPERS +//#define RE_CSCR_PARSER_USE_WRAPPERS +//#define RE_CSCR_PARSETREE_USE_WRAPPERS +//#define RE_CSCR_READWRITE_USE_WRAPPERS +//#define RE_CSCR_STRINGLIST_USE_WRAPPERS +//#define RE_CSCR_VARIABLE_USE_WRAPPERS +//#define RE_CSCR_VM_USE_WRAPPERS +#define RE_CSCR_YACC_USE_WRAPPERS + +//#define DISABLE_RE_CSCR_YACC +//#define DISABLE_RE_CSCR_COMPILER +//#define DISABLE_RE_CSCR_MAIN +//#define DISABLE_RE_CSCR_MEMORYTREE +//#define DISABLE_RE_CSCR_PARSER +//#define DISABLE_RE_CSCR_PARSETREE +//#define DISABLE_RE_CSCR_READWRITE +//#define DISABLE_RE_CSCR_STRINGLIST +//#define DISABLE_RE_CSCR_VM +//#define DISABLE_RE_CSCR_YACC + + namespace game { enum gamemode