diff --git a/data/cdata/fallback/fonts/default.otf b/data/cdata/fallback/fonts/default.otf index 076455df..ad4f12ef 100644 Binary files a/data/cdata/fallback/fonts/default.otf and b/data/cdata/fallback/fonts/default.otf differ diff --git a/deps/GSL b/deps/GSL index 1683d87a..c52bad36 160000 --- a/deps/GSL +++ b/deps/GSL @@ -1 +1 @@ -Subproject commit 1683d87a3f45dff1817e858dbaf006e5ff84e784 +Subproject commit c52bad36aa9d5ececcdf6be2d5cd2dce9daa4194 diff --git a/deps/asmjit b/deps/asmjit index 052b4430..8f2c237b 160000 --- a/deps/asmjit +++ b/deps/asmjit @@ -1 +1 @@ -Subproject commit 052b4430e93f021709d27d2b5d42694ce0c49ce6 +Subproject commit 8f2c237b8315a7d662e0e67d06807296a7bbe5ab diff --git a/deps/libtomcrypt b/deps/libtomcrypt index e6be20bf..3474ca37 160000 --- a/deps/libtomcrypt +++ b/deps/libtomcrypt @@ -1 +1 @@ -Subproject commit e6be20bfc7e92c91dc1ef9cb5cc11a326e41f706 +Subproject commit 3474ca37124c6fe78f5461876542e226a25b5f1f 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 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 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)); diff --git a/src/client/component/scripting.cpp b/src/client/component/scripting.cpp index 267b37e0..9177f60a 100644 --- a/src/client/component/scripting.cpp +++ b/src/client/component/scripting.cpp @@ -4,10 +4,8 @@ #include "game/game.hpp" #include "game/dvars.hpp" -#include "command.hpp" #include "scheduler.hpp" #include "scripting.hpp" -#include "console.hpp" #include "gsc.hpp" #include "game/scripting/event.hpp" @@ -17,7 +15,6 @@ #include #include -#include namespace scripting { 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