From 533be30e21d3b42732852e6879a8450c4f7e417b Mon Sep 17 00:00:00 2001 From: Max-001 Date: Wed, 8 Jan 2025 15:49:04 +0100 Subject: Replaced ENTER by SPACE --- game/menus/mainmenu/TransitionStartSubScript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/menus/mainmenu/TransitionStartSubScript.cpp b/game/menus/mainmenu/TransitionStartSubScript.cpp index 63723cf..f737f7f 100644 --- a/game/menus/mainmenu/TransitionStartSubScript.cpp +++ b/game/menus/mainmenu/TransitionStartSubScript.cpp @@ -6,7 +6,7 @@ using namespace crepe; using namespace std; void TransitionStartSubScript::fixed_update(crepe::duration_t dt) { - if (this->get_key_state(Keycode::ENTER) && this->transition == false) + if (this->get_key_state(Keycode::SPACE) && this->transition == false) this->transition = true; } -- cgit v1.2.3 From 099f9d42db9b15f1be2090ce2a8869ace871a644 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 8 Jan 2025 15:55:05 +0100 Subject: replay for text components --- src/crepe/api/Text.cpp | 13 +++++++++++++ src/crepe/api/Text.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index e5b623d..e5cc39d 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -3,6 +3,7 @@ #include "Text.h" using namespace crepe; +using namespace std; Text::Text( game_object_id_t id, const vec2 & dimensions, const std::string & font_family, @@ -12,3 +13,15 @@ Text::Text( text(text), data(data), font_family(font_family) {} + +unique_ptr Text::save() const { return unique_ptr(new Text(*this)); } + +void Text::restore(const Component & snapshot) { *this = static_cast(snapshot); } + +Text & Text::operator=(const Text & snapshot) { + this->active = snapshot.active; + this->data = snapshot.data; + this->text = snapshot.text; + this->font_family = snapshot.font_family; + return *this; +} diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index 8b3d53e..859490e 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -49,6 +49,12 @@ public: std::optional font; //! Data instance Data data; + +protected: + virtual std::unique_ptr save() const; + Text(const Text &) = default; + virtual void restore(const Component & snapshot); + virtual Text & operator=(const Text &); }; } // namespace crepe -- cgit v1.2.3 From e2f9c0bcaf22aa73689305faca70f2ec4682f55c Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Wed, 8 Jan 2025 16:08:39 +0100 Subject: disable time change --- game/hud/SpeedScript.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp index 906a38f..73469d2 100644 --- a/game/hud/SpeedScript.cpp +++ b/game/hud/SpeedScript.cpp @@ -3,6 +3,8 @@ #include #include #include +#include "../Events.h" +#include "api/BehaviorScript.h" using namespace crepe; using namespace std; @@ -21,6 +23,10 @@ void SpeedScript::init() { return true; }); + this->subscribe([this](const EndGameEvent e) { + this->get_component().active = false; + return false; + }); } void SpeedScript::fixed_update(crepe::duration_t dt) { -- cgit v1.2.3 From f857cb4013701a24cff5131d64e5ab238392faab Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 8 Jan 2025 16:14:27 +0100 Subject: `make format` --- game/hud/SpeedScript.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp index 73469d2..2ced47a 100644 --- a/game/hud/SpeedScript.cpp +++ b/game/hud/SpeedScript.cpp @@ -1,10 +1,10 @@ #include "SpeedScript.h" +#include "../Events.h" +#include "api/BehaviorScript.h" #include #include #include -#include "../Events.h" -#include "api/BehaviorScript.h" using namespace crepe; using namespace std; -- cgit v1.2.3