From 53f5f3f8b0e2ed33204a71e566be6fdbfc07b743 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 15 Oct 2024 20:40:45 +0200 Subject: [PATCH] =?UTF-8?q?Ja=20comprova=20la=20notificaci=C3=B3=20d'eixir?= =?UTF-8?q?=20per=20diferenciarla=20de=20la=20resta=20En=20ARCADE=20la=20n?= =?UTF-8?q?otificaci=C3=B3=20diferencia=20si=20vas=20a=20eixir=20o=20a=20a?= =?UTF-8?q?pagar=20el=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/global_inputs.cpp | 11 +++++++++-- source/utils.cpp | 8 +++++++- source/utils.h | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/source/global_inputs.cpp b/source/global_inputs.cpp index 100891d..0cec1bb 100644 --- a/source/global_inputs.cpp +++ b/source/global_inputs.cpp @@ -29,14 +29,21 @@ namespace globalInputs // Termina void quit(section::Options code) { - if (Notifier::get()->isActive()) + const std::string exit_code = "QUIT"; + auto code_found = stringInVector(Notifier::get()->getCodes(), exit_code); + if (code_found) { section::name = section::Name::QUIT; section::options = code; } else { - Notifier::get()->showText(lang::getText(94)); +#ifdef ARCADE + const int index = code == section::Options::QUIT_NORMAL ? 94 : 116; + Notifier::get()->showText(lang::getText(index), std::string(), -1, exit_code); +#else + Notifier::get()->showText(lang::getText(94), std::string(), -1, exit_code); +#endif } } diff --git a/source/utils.cpp b/source/utils.cpp index ac29902..bd1f055 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -213,4 +213,10 @@ double easeOutQuint(double t) double easeInOutSine(double t) { return -0.5 * (std::cos(M_PI * t) - 1); -} \ No newline at end of file +} + +// Comprueba si una vector contiene una cadena +bool stringInVector(const std::vector &vec, const std::string &str) +{ + return std::find(vec.begin(), vec.end(), str) != vec.end(); +} diff --git a/source/utils.h b/source/utils.h index cff6d95..801c3e4 100644 --- a/source/utils.h +++ b/source/utils.h @@ -282,6 +282,9 @@ double easeOutQuint(double t); // Función de suavizado double easeInOutSine(double t); +// Comprueba si una vector contiene una cadena +bool stringInVector(const std::vector &vec, const std::string &str); + // Colores extern const Color bg_color; extern const Color no_color;