From 14d2398b776d7be3c404af5f4e983b435efaf1d1 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 8 Jan 2025 15:03:34 +0100 Subject: `make format` --- game/hud/SpeedScript.cpp | 4 ++-- game/menus/ButtonReplaySubScript.cpp | 5 ++--- game/menus/ButtonReplaySubScript.h | 1 + game/menus/ButtonSubScene.cpp | 7 +++---- game/menus/endgame/EndGameSubScript.cpp | 2 +- game/menus/mainmenu/CreditsSubScene.cpp | 30 ++++++++++++++++++------------ game/menus/mainmenu/CreditsSubScript.cpp | 4 +--- game/menus/mainmenu/CreditsSubScript.h | 2 +- 8 files changed, 29 insertions(+), 26 deletions(-) diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp index 29d4193..906a38f 100644 --- a/game/hud/SpeedScript.cpp +++ b/game/hud/SpeedScript.cpp @@ -26,11 +26,11 @@ void SpeedScript::init() { void SpeedScript::fixed_update(crepe::duration_t dt) { LoopTimerManager & lp = this->get_loop_timer(); if (this->get_key_state(Keycode::PAGE_UP)) { - if(lp.get_time_scale() >= 2) return; + if (lp.get_time_scale() >= 2) return; lp.set_time_scale(lp.get_time_scale() + 0.1); } if (this->get_key_state(Keycode::PAGE_DOWN)) { - if(lp.get_time_scale() <= 0.5) return; + if (lp.get_time_scale() <= 0.5) return; lp.set_time_scale(lp.get_time_scale() - 0.1); } } diff --git a/game/menus/ButtonReplaySubScript.cpp b/game/menus/ButtonReplaySubScript.cpp index 26cb8ee..9308350 100644 --- a/game/menus/ButtonReplaySubScript.cpp +++ b/game/menus/ButtonReplaySubScript.cpp @@ -1,9 +1,9 @@ #include "ButtonReplaySubScript.h" #include "MenusConfig.h" +#include "../Events.h" #include #include -#include "../Events.h" using namespace crepe; using namespace std; @@ -19,13 +19,12 @@ void ButtonReplaySubScript::init() { replay.record_start(); } - bool ButtonReplaySubScript::on_button_press(const ButtonPressEvent & e) { replay.play(this->recording); return false; } -bool ButtonReplaySubScript::set_recording(){ +bool ButtonReplaySubScript::set_recording() { this->recording = replay.record_end(); return false; } diff --git a/game/menus/ButtonReplaySubScript.h b/game/menus/ButtonReplaySubScript.h index 7e63d06..bfc684d 100644 --- a/game/menus/ButtonReplaySubScript.h +++ b/game/menus/ButtonReplaySubScript.h @@ -8,6 +8,7 @@ class ButtonReplaySubScript : public IButtonScript { public: void init() override; bool on_button_press(const crepe::ButtonPressEvent & e); + private: crepe::recording_t recording = 0; bool set_recording(); diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp index d657be9..30646f1 100644 --- a/game/menus/ButtonSubScene.cpp +++ b/game/menus/ButtonSubScene.cpp @@ -62,12 +62,11 @@ void ButtonSubScene::set_script(crepe::GameObject & button_object, const Data & .set_script(); break; case ScriptSelect::REPLAY: - button_object.add_component() - .set_script(); + button_object.add_component().set_script(); break; case ScriptSelect::CREDITS_BACK: - button_object.add_component() - .set_script(data.tag); + button_object.add_component().set_script(data.tag + ); break; case ScriptSelect::CREDITS_SHOW: button_object.add_component() diff --git a/game/menus/endgame/EndGameSubScript.cpp b/game/menus/endgame/EndGameSubScript.cpp index 08a9f8c..6edfe7b 100644 --- a/game/menus/endgame/EndGameSubScript.cpp +++ b/game/menus/endgame/EndGameSubScript.cpp @@ -1,8 +1,8 @@ #include "EndGameSubScript.h" #include "../../Events.h" -#include "../IFloatingWindowScript.h" #include "../ButtonReplaySubScript.h" +#include "../IFloatingWindowScript.h" #include diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp index bdd6fa0..65576ee 100644 --- a/game/menus/mainmenu/CreditsSubScene.cpp +++ b/game/menus/mainmenu/CreditsSubScene.cpp @@ -55,7 +55,7 @@ void CreditsSubScene::create(Scene & scn) { ButtonSubScene::Data { .text = "Back", .text_width = 150, - .position = {-button_position.x+150, button_position.y}, + .position = {-button_position.x + 150, button_position.y}, .script_type = ButtonSubScene::ScriptSelect::CREDITS_BACK, .button_type = ButtonSubScene::ButtonSelect::BACK, .scale = 0.6, @@ -69,58 +69,64 @@ void CreditsSubScene::create(Scene & scn) { const float Y_OFFSET_NAMES_BEGIN = 100; const float Y_OFFSET_NAMES = 30; const string LOEK = "Loek Le Blansch"; - crepe::vec2 size_loek = {LOEK.size()*SIZE_CHAR_NAMES, (LOEK.size()*SIZE_CHAR_NAMES / LOEK.size()) * 2}; + crepe::vec2 size_loek + = {LOEK.size() * SIZE_CHAR_NAMES, (LOEK.size() * SIZE_CHAR_NAMES / LOEK.size()) * 2}; titel.add_component( size_loek, FONT, Text::Data { .world_space = false, .text_color = Color::WHITE, }, - vec2 {150, -207+Y_OFFSET_NAMES+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK + vec2 {150, -207 + Y_OFFSET_NAMES + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK ); const string WOUTER = "Wouter Boerenkamps"; - crepe::vec2 size_wouter = {WOUTER.size()*SIZE_CHAR_NAMES, (WOUTER.size()*SIZE_CHAR_NAMES / WOUTER.size()) * 2}; + crepe::vec2 size_wouter + = {WOUTER.size() * SIZE_CHAR_NAMES, + (WOUTER.size() * SIZE_CHAR_NAMES / WOUTER.size()) * 2}; titel.add_component( size_wouter, FONT, Text::Data { .world_space = false, .text_color = Color::WHITE, }, - vec2 {150, -207+Y_OFFSET_NAMES*2+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER + vec2 {150, -207 + Y_OFFSET_NAMES * 2 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER ); const string JARO = "Jaro Rutjes"; - crepe::vec2 size_jaro = {JARO.size()*SIZE_CHAR_NAMES, (JARO.size()*SIZE_CHAR_NAMES / JARO.size()) * 2}; + crepe::vec2 size_jaro + = {JARO.size() * SIZE_CHAR_NAMES, (JARO.size() * SIZE_CHAR_NAMES / JARO.size()) * 2}; titel.add_component( size_jaro, FONT, Text::Data { .world_space = false, .text_color = Color::WHITE, }, - vec2 {150, -207+Y_OFFSET_NAMES*3+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO + vec2 {150, -207 + Y_OFFSET_NAMES * 3 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO ); const string MAX = "Max Smits"; - crepe::vec2 size_max = {MAX.size()*SIZE_CHAR_NAMES, (MAX.size()*SIZE_CHAR_NAMES / MAX.size()) * 2}; + crepe::vec2 size_max + = {MAX.size() * SIZE_CHAR_NAMES, (MAX.size() * SIZE_CHAR_NAMES / MAX.size()) * 2}; titel.add_component( size_max, FONT, Text::Data { .world_space = false, .text_color = Color::WHITE, }, - vec2 {150, -207+Y_OFFSET_NAMES*4+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX + vec2 {150, -207 + Y_OFFSET_NAMES * 4 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX ); const string NIELS = "Niels Stunnebrink"; - crepe::vec2 size_niels = {NIELS.size()*SIZE_CHAR_NAMES, (NIELS.size()*SIZE_CHAR_NAMES / NIELS.size()) * 2}; + crepe::vec2 size_niels + = {NIELS.size() * SIZE_CHAR_NAMES, (NIELS.size() * SIZE_CHAR_NAMES / NIELS.size()) * 2 + }; titel.add_component( size_niels, FONT, Text::Data { .world_space = false, .text_color = Color::WHITE, }, - vec2 {150, -207+Y_OFFSET_NAMES*5+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS + vec2 {150, -207 + Y_OFFSET_NAMES * 5 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS ); - } diff --git a/game/menus/mainmenu/CreditsSubScript.cpp b/game/menus/mainmenu/CreditsSubScript.cpp index ce74ba4..4224dc8 100644 --- a/game/menus/mainmenu/CreditsSubScript.cpp +++ b/game/menus/mainmenu/CreditsSubScript.cpp @@ -1,8 +1,8 @@ #include "CreditsSubScript.h" #include "../../Events.h" -#include "../IFloatingWindowScript.h" #include "../ButtonReplaySubScript.h" +#include "../IFloatingWindowScript.h" #include @@ -13,7 +13,6 @@ using namespace crepe; - CreditsSubScript::CreditsSubScript(const std::string & tag) { this->tag = tag; } void CreditsSubScript::init() { @@ -57,4 +56,3 @@ bool CreditsSubScript::enable_all() { bool CreditsSubScript::on_button_press(const ButtonPressEvent & e) { return this->disable_all(); } - diff --git a/game/menus/mainmenu/CreditsSubScript.h b/game/menus/mainmenu/CreditsSubScript.h index e411202..81f941a 100644 --- a/game/menus/mainmenu/CreditsSubScript.h +++ b/game/menus/mainmenu/CreditsSubScript.h @@ -1,7 +1,7 @@ #pragma once -#include "../IFloatingWindowScript.h" #include "../IButtonScript.h" +#include "../IFloatingWindowScript.h" #include #include -- cgit v1.2.3