From 468fbe5d071fb6ce587bcce9fee4e39c3fb62f45 Mon Sep 17 00:00:00 2001 From: aixxe Date: Fri, 23 Dec 2016 20:45:37 +0000 Subject: [PATCH] Move default settings to relevant hook files. Signed-off-by: aixxe --- src/GUI/GUI.cpp | 8 -------- src/Hooks/CreateMove.cpp | 2 ++ src/Hooks/FrameStageNotify.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/GUI/GUI.cpp b/src/GUI/GUI.cpp index 6e0235a..fd077bf 100644 --- a/src/GUI/GUI.cpp +++ b/src/GUI/GUI.cpp @@ -2,14 +2,6 @@ bool GUI::IsVisible = false; -bool GUI::BunnyHop::Enabled = true; - -bool GUI::NoSky::Enabled = true; -float GUI::NoSky::Color[3] = {0, 0, 0.275}; - -bool GUI::ASUS::Enabled = true; -float GUI::ASUS::Color[4] = {1, 1, 1, 0.75}; - void GUI::Render() { // Draw various global components. GUI::DrawFramerateCounter(); diff --git a/src/Hooks/CreateMove.cpp b/src/Hooks/CreateMove.cpp index 43dd5d4..8cb53be 100644 --- a/src/Hooks/CreateMove.cpp +++ b/src/Hooks/CreateMove.cpp @@ -2,6 +2,8 @@ typedef void (*CreateMove_t) (IBaseClientDLL*, int, float, bool); +bool GUI::BunnyHop::Enabled = true; + void Hooks::CreateMove(IBaseClientDLL* thisptr, int sequence, float frametime, bool active) { // Get the original function and store it statically. static CreateMove_t oCreateMove = clientdll_hook->GetOriginalFunction(21); diff --git a/src/Hooks/FrameStageNotify.cpp b/src/Hooks/FrameStageNotify.cpp index 832cfbe..4379d64 100644 --- a/src/Hooks/FrameStageNotify.cpp +++ b/src/Hooks/FrameStageNotify.cpp @@ -2,6 +2,12 @@ typedef void (*FrameStageNotify_t) (IBaseClientDLL*, ClientFrameStage_t); +bool GUI::NoSky::Enabled = true; +float GUI::NoSky::Color[3] = {0, 0, 0.275}; + +bool GUI::ASUS::Enabled = true; +float GUI::ASUS::Color[4] = {1, 1, 1, 0.75}; + void Hooks::FrameStageNotify(IBaseClientDLL* thisptr, ClientFrameStage_t stage) { // Get the original function and store it statically. static FrameStageNotify_t oFrameStageNotify = clientdll_hook->GetOriginalFunction(35);