diff --git a/include/MiscTemporary.hpp b/include/MiscTemporary.hpp index d5a172cd..98d4b879 100755 --- a/include/MiscTemporary.hpp +++ b/include/MiscTemporary.hpp @@ -33,6 +33,7 @@ extern settings::Int print_r; extern settings::Int print_g; extern settings::Int print_b; extern int stored_buttons; +extern settings::Bool null_graphics; #if ENABLE_VISUALS extern bool freecam_is_toggled; #endif diff --git a/src/MiscTemporary.cpp b/src/MiscTemporary.cpp index d6c72223..3031fed7 100755 --- a/src/MiscTemporary.cpp +++ b/src/MiscTemporary.cpp @@ -26,3 +26,4 @@ settings::Bool disable_visuals{ "visual.disable", "false" }; settings::Int print_r{ "print.rgb.r", "183" }; settings::Int print_g{ "print.rgb.b", "27" }; settings::Int print_b{ "print.rgb.g", "139" }; +settings::Bool null_graphics("hack.nullgraphics", "false"); diff --git a/src/hack.cpp b/src/hack.cpp index 5c7477dd..ad0c33aa 100644 --- a/src/hack.cpp +++ b/src/hack.cpp @@ -182,12 +182,13 @@ static void ReduceRamUsage() // g_IMaterialSystem->ReloadTextures(); g_IBaseClient->InvalidateMdlCache(); } + static void UnHookFs() { fs_hook2.Release(); g_IBaseClient->InvalidateMdlCache(); } -static settings::Bool null_graphics("hack.nullgraphics", "false"); + static void InitRandom() { int rand_seed; diff --git a/src/hooks/textmode/DrawModelExecute.cpp b/src/hooks/textmode/DrawModelExecute.cpp index b8bced93..982c8298 100644 --- a/src/hooks/textmode/DrawModelExecute.cpp +++ b/src/hooks/textmode/DrawModelExecute.cpp @@ -3,10 +3,14 @@ Copyright (c) 2018 nullworks. All rights reserved. */ #include "HookedMethods.hpp" +#include "MiscTemporary.hpp" namespace hooked_methods { DEFINE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *this_, const DrawModelState_t &state, const ModelRenderInfo_t &info, matrix3x4_t *bone) { + if (*null_graphics) + return; + return original::DrawModelExecute(this_, state, info, bone); } } // namespace hooked_methods diff --git a/src/votelogger.cpp b/src/votelogger.cpp index 8861365e..5950a3df 100644 --- a/src/votelogger.cpp +++ b/src/votelogger.cpp @@ -13,7 +13,7 @@ static settings::Bool vote_kicky{ "votelogger.autovote.yes", "false" }; static settings::Bool vote_kickn{ "votelogger.autovote.no", "false" }; static settings::Bool vote_rage_vote{ "votelogger.autovote.no.rage", "false" }; static settings::Bool party_say{ "votelogger.partysay", "true" }; -static settings::Bool party_say_casts{ "votelogger.partysay-casts", "true" }; +static settings::Bool party_say_casts{ "votelogger.partysay-casts", "false" }; static settings::Bool party_say_f1_only{ "votelogger.partysay-casts.f1-only", "true" }; static settings::Bool abandon_and_crash_on_kick{ "votelogger.restart-on-kick", "false" };