From f25a532e9655d95ed18edb8f23b6791827925369 Mon Sep 17 00:00:00 2001 From: braaaap master <73117766+d3fc0n6@users.noreply.github.com> Date: Fri, 2 Apr 2021 18:15:08 -0500 Subject: [PATCH] Remove joke features (#1405) --- data/menu/nullifiedcat/misc/collective.xml | 2 - include/core/macros.hpp | 1 - src/hacks/Misc.cpp | 31 ------- src/visual/CMakeLists.txt | 1 - src/visual/fidgetspinner.cpp | 94 ---------------------- 5 files changed, 129 deletions(-) delete mode 100644 src/visual/fidgetspinner.cpp diff --git a/data/menu/nullifiedcat/misc/collective.xml b/data/menu/nullifiedcat/misc/collective.xml index 5de8f3c7..da17d325 100755 --- a/data/menu/nullifiedcat/misc/collective.xml +++ b/data/menu/nullifiedcat/misc/collective.xml @@ -9,8 +9,6 @@ - - diff --git a/include/core/macros.hpp b/include/core/macros.hpp index 3c6b1085..16a37ea0 100644 --- a/include/core/macros.hpp +++ b/include/core/macros.hpp @@ -21,4 +21,3 @@ constexpr int c_strcmp(char const *lhs, char const *rhs) } //#define FEATURE_RADAR_DISABLED -#define FEATURE_FIDGET_SPINNER_DISABLED diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp index 3b260e85..0759470c 100644 --- a/src/hacks/Misc.cpp +++ b/src/hacks/Misc.cpp @@ -41,9 +41,7 @@ static settings::Boolean force_wait{ "misc.force-enable-wait", "true" }; static settings::Boolean scc{ "misc.scoreboard.match-custom-team-colors", "false" }; #if ENABLE_VISUALS -static settings::Boolean god_mode{ "misc.god-mode", "false" }; static settings::Boolean debug_info{ "misc.debug-info", "false" }; -static settings::Boolean no_homo{ "misc.no-homo", "true" }; static settings::Boolean show_spectators{ "misc.show-spectators", "false" }; static settings::Boolean misc_drawhitboxes{ "misc.draw-hitboxes", "false" }; // Useful for debugging with showlagcompensation @@ -347,35 +345,6 @@ void Draw() { g_ISurface->PlaySound() }*/ - if (god_mode) - for (int i = 0; i < 40000; i++) - { - g_ISurface->PlaySound("vo/demoman_cloakedspy03.mp3"); - god_mode = 0; - } - if (!no_homo) - { - int width, height; - g_IEngine->GetScreenSize(width, height); - - // Create steps from screen size - int step = (height / 7); - - // Go through steps creating a rainbow screen - for (int i = 1; i < 8; i++) - { - // Get Color and set opacity to %50 - colors::rgba_t gaybow = colors::FromHSL(fabs(sin((g_GlobalVars->curtime / 2.0f) + (i / 1.41241f))) * 360.0f, 0.85f, 0.9f); - gaybow.a = .5; - // Draw next step - draw::Rectangle(0, step * (i - 1), width, (step * i) - (step * (i - 1)), gaybow); - } - - // int size_x; - // FTGL_StringLength(string.data, fonts::font_main, &size_x); - // FTGL_Draw(string.data, draw_point.x - size_x / 2, - // draw_point.y,fonts::font_main, color); - } if (show_spectators) { for (int i = 0; i < PLAYER_ARRAY_SIZE; i++) diff --git a/src/visual/CMakeLists.txt b/src/visual/CMakeLists.txt index ee93bb0a..5c045b02 100755 --- a/src/visual/CMakeLists.txt +++ b/src/visual/CMakeLists.txt @@ -4,7 +4,6 @@ set(files "${CMAKE_CURRENT_LIST_DIR}/atlas.cpp" "${CMAKE_CURRENT_LIST_DIR}/drawmgr.cpp" "${CMAKE_CURRENT_LIST_DIR}/EffectGlow.cpp" "${CMAKE_CURRENT_LIST_DIR}/EventLogging.cpp" - "${CMAKE_CURRENT_LIST_DIR}/fidgetspinner.cpp" "${CMAKE_CURRENT_LIST_DIR}/picopng.cpp" "${CMAKE_CURRENT_LIST_DIR}/SDLHooks.cpp") diff --git a/src/visual/fidgetspinner.cpp b/src/visual/fidgetspinner.cpp deleted file mode 100644 index 33839a6e..00000000 --- a/src/visual/fidgetspinner.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - * fidgetspinner.cpp - * - * Created on: Jul 4, 2017 - * Author: nullifiedcat - */ - -#include "common.hpp" - -#include -#include - -#ifndef FEATURE_FIDGET_SPINNER_ENABLED - -static settings::Boolean enable_spinner{ "visual.fidget-spinner.enable", "false" }; -static settings::Float spinner_speed_cap{ "visual.fidget-spinner.speed-cap", "30" }; -static settings::Float spinner_speed_scale{ "visual.fidget-spinner.speed-scale", "0.03" }; -static settings::Float spinner_decay_speed{ "visual.fidget-spinner.decay-speed", "0.1" }; -static settings::Float spinner_scale{ "visual.fidget-spinner.scale", "32" }; -static settings::Float spinner_min_speed{ "visual.fidget-spinner.min-speed", "2" }; - -static float spinning_speed = 0.0f; -static float angle = 0; - -// DEBUG -/*CatCommand add_spinner_speed("fidgetspinner_debug_speedup", "Add speed", []() -{ spinning_speed += 100.0f; -});*/ - -class SpinnerListener : public IGameEventListener -{ -public: - void FireGameEvent(KeyValues *event) override - { - std::string name(event->GetName()); - if (name == "player_death") - { - int attacker = event->GetInt("attacker"); - int eid = g_IEngine->GetPlayerForUserID(attacker); - if (eid == g_IEngine->GetLocalPlayer()) - { - spinning_speed += 300.0f; - // logging::Info("Spinning %.2f", spinning_speed); - } - } - } -}; - -static SpinnerListener spinner_listener; - -void InitSpinner() -{ - g_IGameEventManager->AddListener(&spinner_listener, false); -} - -static Timer retrytimer{}; - -void DrawSpinner() -{ - if (not enable_spinner) - return; - spinning_speed -= (spinning_speed > 150.0f) ? float(spinner_decay_speed) : float(spinner_decay_speed) / 2.0f; - if (spinning_speed < float(spinner_min_speed)) - spinning_speed = float(spinner_min_speed); - if (spinning_speed > 1000) - spinning_speed = 1000; - float real_speed = 0; - const float speed_cap(spinner_speed_cap); - if (spinning_speed < 250) - real_speed = speed_cap * (spinning_speed / 250.0f); - else if (spinning_speed < 500) - real_speed = speed_cap - (speed_cap - 10) * ((spinning_speed - 250.0f) / 250.0f); - else if (spinning_speed < 750) - real_speed = 10 + (speed_cap - 20) * ((spinning_speed - 500.0f) / 250.0f); - else - real_speed = (speed_cap - 10) + 10 * ((spinning_speed - 750.0f) / 250.0f); - const float speed_scale(spinner_speed_scale); - const float size(spinner_scale); - angle += speed_scale * real_speed; - int state = min(3, int(spinning_speed / 250)); - - draw::RectangleTextured(draw::width / 2 - size * 0.5f, draw::height / 2 - size * 0.5f, size, size, colors::white, textures::atlas().texture, 64 * state, 4 * 64, 64, 64, angle); - if (angle > PI * 4) - angle -= PI * 4; -} - -static InitRoutine init([]() { - InitSpinner(); - EC::Register(EC::Draw, DrawSpinner, "spinner"); - EC::Register( - EC::Shutdown, []() { g_IGameEventManager->RemoveListener(&spinner_listener); }, "shutdown_spinner"); -}); - -#endif