From c7fcbd0258db57ecc1104c32678fd8eb017d85d3 Mon Sep 17 00:00:00 2001 From: Sergio Valor Martinez Date: Thu, 29 Dec 2022 11:58:32 +0100 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidos=20nuevos=20iconos=20para=20las=20?= =?UTF-8?q?notificaciones.=20Redise=C3=B1ada=20la=20notificaci=C3=B3n=20de?= =?UTF-8?q?=20login.=20Arreglado=20bug:=20No=20se=20podia=20elegir=20un=20?= =?UTF-8?q?icono=20para=20las=20notificaciones=20que=20no=20fuera=20de=20l?= =?UTF-8?q?a=20primera=20fila?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/notifications/notify.png | Bin 433 -> 523 bytes source/common/notify.cpp | 2 +- source/director.cpp | 2 +- source/enter_id.cpp | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/notifications/notify.png b/data/notifications/notify.png index de802f80c36e9ebe72ba5a81ad5e2119b25795e9..99f6191eb40e45879a4042a5a5ca612dc9474cd6 100644 GIT binary patch delta 418 zcmV;T0bTyF1B(QZF@MELL_t(|obB7uj)E`{1yC^l|1Z}k3{g5QSge+F-dHyOk3W6XkwYf2+&!aIlwfvvk`e3W;Jjkgn!(*TGZH#Fs9~>bbC^n-N;ob77^Wuf3n= zYI0+bd}qe-lPe)yhXB%*0MeBJ($y*3v9^w1|L!#m)1(8^S+fpU`$HjXxvYf&Y_Ws} z5w~Ev3OnH52Zq}He6Y{~>Ca{ada)e~00000000000Fz1qMi=Pr0nZ&&3Hd_R4gdfE M07*qoM6N<$f`O&dbN~PV delta 314 zcmV-A0mc4{1hE5R1wb*~|CZ^O4Qb_}1zX9?pD7O$PA*jm zOGb<_rq>~akZU`_ujl6)AB+0F@E;utLD>4{+SGn8wQ1?g{jBN5Ue(D3VT2fC+?zAK zmyz>xy;lH_EbNF7Y~ic56T-PXmgQWaS_5-*td_q3TL^8(_kXw6n_Qo*J9 zBMfINnJ~`buPR_IRJPsuJbDe32B%h;NBos%- zc<;Lxu+qzC+wmN_Rlp-*5F9qe3RZeISNq(Sov_faR8dVMwnCeRLZO2iG}|rG>&5dld%CqlfVHL7{Glz0T)}`BH)Ziod5s; M07*qoM6N<$f*3rMb^rhX diff --git a/source/common/notify.cpp b/source/common/notify.cpp index a6f686c..fe0b1cb 100644 --- a/source/common/notify.cpp +++ b/source/common/notify.cpp @@ -222,7 +222,7 @@ void Notify::showText(std::string text1, std::string text2, int icon) { Sprite *sp = new Sprite({0, 0, iconSize, iconSize}, iconTexture, renderer); sp->setPos({padding, padding, iconSize, iconSize}); - sp->setSpriteClip({iconSize * icon, 0, iconSize, iconSize}); + sp->setSpriteClip({iconSize * (icon % 10), iconSize * (icon / 10), iconSize, iconSize}); sp->render(); delete sp; } diff --git a/source/director.cpp b/source/director.cpp index fe29979..810ea63 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -19,7 +19,7 @@ Director::Director(int argc, char *argv[]) section->subsection = SUBSECTION_LOGO_TO_INTRO; #ifdef DEBUG - section->name = SECTION_PROG_GAME; + section->name = SECTION_PROG_LOGO; #endif // Crea e inicializa las opciones del programa diff --git a/source/enter_id.cpp b/source/enter_id.cpp index af7d72b..cf5fdd7 100644 --- a/source/enter_id.cpp +++ b/source/enter_id.cpp @@ -296,11 +296,11 @@ void EnterID::initOnline() jscore::init(options->online.server, options->online.port); #ifdef DEBUG - const std::string caption = options->online.jailerID + " IS LOGGED IN (DEBUG)"; + const std::string caption = "IS LOGGED IN (DEBUG)"; #else - const std::string caption = options->online.jailerID + " IS LOGGED IN"; + const std::string caption = "IS LOGGED IN"; #endif - screen->showNotification(caption); + screen->showNotification(options->online.jailerID, caption, 11); if (options->console) { std::cout << caption << std::endl;