bumping version to 5.4

Javanaise · Feb 5, 2024 · 865be65 · 865be65
1 parent c4ec620
commit 865be65
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Assets/mrboom.rc b/Assets/mrboom.rc
@@ -1,20 +1,20 @@
 id ICON "./mrboom.ico"
 1 VERSIONINFO
-FILEVERSION     5,3,0,0
-PRODUCTVERSION  5,3,0,0
+FILEVERSION     5,4,0,0
+PRODUCTVERSION  5,4,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "080904E4"
     BEGIN
       VALUE "CompanyName", "Remdy Software"
       VALUE "FileDescription", "MrBoom"
-      VALUE "FileVersion", "5.3"
+      VALUE "FileVersion", "5.4"
       VALUE "InternalName", "mrboom"
       VALUE "LegalCopyright", "Remdy Software"
       VALUE "OriginalFilename", "MrBoom.exe"
       VALUE "ProductName", "MrBoom"
-      VALUE "ProductVersion", "5.3"
+      VALUE "ProductVersion", "5.4"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/common.hpp b/common.hpp
@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 #define GAME_NAME            "Mr.Boom"
-#define GAME_VERSION "5.3"
+#define GAME_VERSION "5.4"
 #define PATH_MAX_LENGTH      256
 #define WIDTH                320
 #define HEIGHT               200

diff --git a/sdl2/sdl2.cpp b/sdl2/sdl2.cpp
@@ -12,6 +12,11 @@
 #include "MrboomHelper.hpp"
 #include "xbrz.h"
 
+#ifndef SDL_HINT_SHUTDOWN_DBUS_ON_QUIT
+#error Please use at least SDL version 2.30.0
+#endif
+
+
 #define IFTRACES (traceMask & DEBUG_SDL2)
 
 #ifdef DEBUG
@@ -774,8 +779,9 @@ void pollEvent()
             break;
 
          case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK:
+         case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE:
             if (IFTRACES)
-               log_info("SDL_CONTROLLER_BUTTON_BACK\n");
+               log_info("SDL_CONTROLLER_BUTTON_BACK or SDL_CONTROLLER_BUTTON_GUIDE\n");
             updateInput(button_select, player, 1, false);
             anySelectButtonPushedMask = anySelectButtonPushedMask | (1 << e.jbutton.which);
             break;
@@ -812,7 +818,7 @@ void pollEvent()
             */
          default:
             if (IFTRACES)
-               log_info("unknown button\n");
+               log_info("unknown button %d\n", e.cbutton.button);
             break;
          }
          anyButtonPushedMask = anyButtonPushedMask | (1 << e.jbutton.button);
@@ -883,8 +889,9 @@ void pollEvent()
             break;
 
          case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK:
+         case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE:         
             if (IFTRACES)
-               log_info("SDL_CONTROLLER_BUTTON_BACK\n");
+               log_info("SDL_CONTROLLER_BUTTON_BACK or SDL_CONTROLLER_BUTTON_GUIDE\n");
             updateInput(button_select, player, 0, false);
             anySelectButtonPushedMask = anySelectButtonPushedMask & ~(1 << e.jbutton.which);
             break;
@@ -922,7 +929,7 @@ void pollEvent()
                      */
          default:
             if (IFTRACES)
-               log_info("unknown button\n");
+               log_info("unknown button %d\n", e.cbutton.button);
             break;
          }
          anyButtonPushedMask = anyButtonPushedMask & ~(1 << e.jbutton.button);