From a3e815bb200522fa345cd424cfb32288e384c6b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 22:17:30 +0000 Subject: [PATCH 01/11] Bump deps/minhook from `4a45552` to `426cb68` Bumps [deps/minhook](https://github.com/TsudaKageyu/minhook) from `4a45552` to `426cb68`. - [Release notes](https://github.com/TsudaKageyu/minhook/releases) - [Commits](https://github.com/TsudaKageyu/minhook/compare/4a455528f61b5a375b1f9d44e7d296d47f18bb18...426cb6880035ee3cceed05384bb3f2db01a20a15) --- updated-dependencies: - dependency-name: deps/minhook dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- deps/minhook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/minhook b/deps/minhook index 4a455528..426cb688 160000 --- a/deps/minhook +++ b/deps/minhook @@ -1 +1 @@ -Subproject commit 4a455528f61b5a375b1f9d44e7d296d47f18bb18 +Subproject commit 426cb6880035ee3cceed05384bb3f2db01a20a15 From 44fafb1cd0d6ed9e7792af07ed3616459bf18b52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 22:17:32 +0000 Subject: [PATCH 02/11] Bump deps/asmjit from `052b443` to `15a6036` Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `052b443` to `15a6036`. - [Release notes](https://github.com/asmjit/asmjit/releases) - [Commits](https://github.com/asmjit/asmjit/compare/052b4430e93f021709d27d2b5d42694ce0c49ce6...15a603661871b86c048e697f0e6cd17374dcecc0) --- updated-dependencies: - dependency-name: deps/asmjit dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- deps/asmjit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/asmjit b/deps/asmjit index 052b4430..15a60366 160000 --- a/deps/asmjit +++ b/deps/asmjit @@ -1 +1 @@ -Subproject commit 052b4430e93f021709d27d2b5d42694ce0c49ce6 +Subproject commit 15a603661871b86c048e697f0e6cd17374dcecc0 From 39ae8e4ba59624d4886564b1570675cfd251eaf5 Mon Sep 17 00:00:00 2001 From: Edo Date: Wed, 12 Oct 2022 18:55:39 +0100 Subject: [PATCH 03/11] Remove memcpy --- src/client/component/gsc.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/component/gsc.cpp b/src/client/component/gsc.cpp index 41edd94b..cc207a3c 100644 --- a/src/client/component/gsc.cpp +++ b/src/client/component/gsc.cpp @@ -626,7 +626,6 @@ namespace gsc utils::hook::set(0x1405BC7BC, 0x1000); // change builtin func count #define RVA(ptr) static_cast(reinterpret_cast(ptr) - 0x140000000) - std::memcpy(&func_table, reinterpret_cast(0x14B153F90), 0x1900); utils::hook::set(0x1405BC7C2 + 4, RVA(&func_table)); utils::hook::inject(0x1405BCB78 + 3, &func_table); utils::hook::set(0x1405CA678 + 4, RVA(&func_table)); From 6ecb84ad2f6dbbf37a71a7cd3795e8b51b80a27b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 22:20:06 +0000 Subject: [PATCH 04/11] Bump deps/GSL from `1683d87` to `991fa66` Bumps [deps/GSL](https://github.com/Microsoft/GSL) from `1683d87` to `991fa66`. - [Release notes](https://github.com/Microsoft/GSL/releases) - [Commits](https://github.com/Microsoft/GSL/compare/1683d87a3f45dff1817e858dbaf006e5ff84e784...991fa6682e819590c695f00c6b880548e55fa914) --- updated-dependencies: - dependency-name: deps/GSL dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- deps/GSL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/GSL b/deps/GSL index 1683d87a..991fa668 160000 --- a/deps/GSL +++ b/deps/GSL @@ -1 +1 @@ -Subproject commit 1683d87a3f45dff1817e858dbaf006e5ff84e784 +Subproject commit 991fa6682e819590c695f00c6b880548e55fa914 From 7c30b73adaf3189ab8dd3f20e994aee8fc27a568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 22:14:30 +0000 Subject: [PATCH 05/11] Bump deps/zlib from `21767c6` to `04f42ce` Bumps [deps/zlib](https://github.com/madler/zlib) from `21767c6` to `04f42ce`. - [Release notes](https://github.com/madler/zlib/releases) - [Commits](https://github.com/madler/zlib/compare/21767c654d31d2dccdde4330529775c6c5fd5389...04f42ceca40f73e2978b50e93806c2a18c1281fc) --- updated-dependencies: - dependency-name: deps/zlib dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- deps/zlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/zlib b/deps/zlib index 21767c65..04f42cec 160000 --- a/deps/zlib +++ b/deps/zlib @@ -1 +1 @@ -Subproject commit 21767c654d31d2dccdde4330529775c6c5fd5389 +Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc From 91a1cd4d06f84be39f0b012c6d048aab45010341 Mon Sep 17 00:00:00 2001 From: FutureRave Date: Fri, 14 Oct 2022 23:09:17 +0100 Subject: [PATCH 06/11] improvements from s1x --- src/client/component/ui_scripting.cpp | 42 ++++--------------- src/client/game/symbols.hpp | 12 +++--- src/client/game/ui_scripting/execution.cpp | 4 +- src/client/game/ui_scripting/script_value.hpp | 2 +- 4 files changed, 18 insertions(+), 42 deletions(-) diff --git a/src/client/component/ui_scripting.cpp b/src/client/component/ui_scripting.cpp index ccf4dabf..1d364858 100644 --- a/src/client/component/ui_scripting.cpp +++ b/src/client/component/ui_scripting.cpp @@ -39,16 +39,10 @@ namespace ui_scripting utils::hook::detour hks_shutdown_hook; utils::hook::detour hks_package_require_hook; - struct script - { - std::string name; - std::string root; - }; - struct globals_t { std::string in_require_script; - std::vector