From 7951f3332a85bdd45508b577ee2e4bdcfdfafcf4 Mon Sep 17 00:00:00 2001 From: Kasi Date: Tue, 22 Sep 2020 20:58:30 +0100 Subject: [PATCH] Release 1.55 --- Include/Game/Tools/BreakHandler.hpp | 5 ++++- Library/libAlpacaLibrary.a | Bin 8541846 -> 8542656 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Include/Game/Tools/BreakHandler.hpp b/Include/Game/Tools/BreakHandler.hpp index 8546703..2fb8a1c 100644 --- a/Include/Game/Tools/BreakHandler.hpp +++ b/Include/Game/Tools/BreakHandler.hpp @@ -3,6 +3,7 @@ #include "../../Core/Types/Timer.hpp" #include "../../Core/Types/Counter.hpp" +#include "../../Core/Types/Countdown.hpp" namespace BreakHandler { @@ -17,9 +18,11 @@ namespace BreakHandler struct BreakTime { - std::int64_t TimeOfLastBreak = 0; + std::int64_t TimeOfLastBreak; std::int64_t BreakEvery; std::int64_t BreakFor; + bool OnBreak = false; + Countdown BreakCountdown; }; BreakTime GetMiniBreakTime(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index f72cc8e7ff0c2759146284340b80bfc7679308b9..6612ba139b177ca65274965d91009f27a75aed1f 100644 GIT binary patch delta 15666 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 delta 17414 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