From 51eb9333836a2095bb2d39faab263ea0037572be Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 10 Oct 2024 20:14:18 +0200
Subject: [PATCH 1/2] =?UTF-8?q?-=20[FIX]=20Arreglats=20els=20errors=20de?=
 =?UTF-8?q?=20la=20paleta=20de=20f=C3=B3sforo=20-=20[CHG]=20Augmentades=20?=
 =?UTF-8?q?les=20probabilitats=20de=20una=20Cat's=20Life=20-=20[NEW]=20Inf?=
 =?UTF-8?q?ormaci=C3=B3=20dels=20renderers=20al=20arrancar=20-=20[FIX]=20Q?=
 =?UTF-8?q?uan=20apareix=20un=20dialeg=20ja=20no=20es=20queda=20el=20s?=
 =?UTF-8?q?=C3=B3=20de=20caminar=20sonant=20de=20fondo=20-=20[NEW]=20Quan?=
 =?UTF-8?q?=20apareix=20un=20dialeg=20i=20sona=20una=20fanfarria,=20la=20m?=
 =?UTF-8?q?=C3=BAsica=20se=20pausa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/fosforo.gif  | Bin 148 -> 148 bytes
 source/actor.cpp  |   4 ++--
 source/jdraw.cpp  |  12 ++++++++++++
 source/m_game.cpp |   3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/data/fosforo.gif b/data/fosforo.gif
index 62a466c64cde9803c9574d5a238b183e78206309..cf2a9c8b2a560b4f22add6f14afd3009154a9b73 100644
GIT binary patch
delta 44
WcmbQjIE8V7my!Yl0|7KKM*{$QeFV$^

delta 44
UcmbQjIE8V7ml6X(Ffm6109(BSOaK4?

diff --git a/source/actor.cpp b/source/actor.cpp
index 202b5cb..3a363de 100644
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -2435,13 +2435,13 @@ namespace actor
         int partsCollected = 0;
         bool roomVisited[MAX_ROOMS];
         int livesLost = 0;
-        int catsLifeOdds = 5;
+        int catsLifeOdds = 2;
         uint32_t start_time = 0;
 
         void reset()
         {
             partsCollected = livesLost = 0;
-            catsLifeOdds = 5;
+            catsLifeOdds = 2;
             for (int i = 0; i < MAX_ROOMS; ++i)
                 roomVisited[i] = false;
             start_time = SDL_GetTicks();
diff --git a/source/jdraw.cpp b/source/jdraw.cpp
index 5c2d10b..a4d2639 100644
--- a/source/jdraw.cpp
+++ b/source/jdraw.cpp
@@ -93,6 +93,18 @@ namespace draw
         sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
         sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
 
+        SDL_RendererInfo info;
+        const int num_render_drivers = SDL_GetNumRenderDrivers();
+        printf("Available renderers:\n");
+        for (int i=0; i<num_render_drivers; ++i)
+        {
+            SDL_GetRenderDriverInfo(i, &info);
+            printf(" - %i: %s\n", i, info.name);
+        }
+
+        SDL_GetRendererInfo(sdl_renderer, &info);
+        printf("\nRenderer: %s\n", info.name);
+
         if (screen_fullscreen)        
         {
             SDL_ShowCursor(false);
diff --git a/source/m_game.cpp b/source/m_game.cpp
index 15c2257..8914c2b 100644
--- a/source/m_game.cpp
+++ b/source/m_game.cpp
@@ -296,6 +296,7 @@ namespace modules
             if ( (controller::pressed(KEY_MENU)) || (controller::pressed(KEY_PICK)) || (controller::pressed(KEY_JUMP)) )
             {
                 missatge[0] = 0;
+                audio::resumeMusic();
                 return;
             }
             draw::color(BLACK);
@@ -989,6 +990,8 @@ namespace modules
 
         void setMissatge(const char *text)
         {
+            actor::pauseWalkSound();
+            audio::pauseMusic();
             strcpy(missatge, text);
         }
 

From b5f44256722fa36738afa92fa238ad420804dd9a Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 10 Oct 2024 20:38:12 +0200
Subject: [PATCH 2/2] - [FIX] Ja no es mostra el cursor mai (excepte si estas
 editant)

---
 source/jdraw.cpp | 8 ++++----
 source/main.cpp  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/jdraw.cpp b/source/jdraw.cpp
index a4d2639..ddd03d8 100644
--- a/source/jdraw.cpp
+++ b/source/jdraw.cpp
@@ -105,9 +105,10 @@ namespace draw
         SDL_GetRendererInfo(sdl_renderer, &info);
         printf("\nRenderer: %s\n", info.name);
 
+        SDL_ShowCursor(false);
+        
         if (screen_fullscreen)        
         {
-            SDL_ShowCursor(false);
             int w, h;
             SDL_GetWindowSize(sdl_window, &w, &h);
             fullscreen_scale = h/screen_height;
@@ -118,7 +119,6 @@ namespace draw
         }
         else
         {
-            SDL_ShowCursor(true);
             dest_rect.x = dest_rect.y = 0;
             dest_rect.w = screen_width * zoom;
             dest_rect.h = screen_height * zoom;
@@ -187,9 +187,10 @@ namespace draw
         sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
         sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
 
+        SDL_ShowCursor(false);
+
         if (screen_fullscreen)        
         {
-            SDL_ShowCursor(false);
             int w, h;
             SDL_GetWindowSize(sdl_window, &w, &h);
             fullscreen_scale = h/screen_height;
@@ -200,7 +201,6 @@ namespace draw
         }
         else
         {
-            SDL_ShowCursor(true);
             dest_rect.x = dest_rect.y = 0;
             dest_rect.w = screen_width * zoom;
             dest_rect.h = screen_height * zoom;
diff --git a/source/main.cpp b/source/main.cpp
index 88f0f4e..e491e92 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -104,9 +104,10 @@ void game::init()
 {
     if (game::getParams(1) && strcmp(game::getParams(1), "editor")==0) editor::setDevMode();
 
-    if (editor::isDevMode())
+    if (editor::isDevMode()) {
         draw::init("The Pool", 520, 240, zoom);
-    else {
+        SDL_ShowCursor(true);
+    } else {
         loadConfig();
         draw::init("The Pool", 320, 240, zoom, fullscreen);
         console::init();