gosu 1.4.5.pre1 → 1.4.6

data/ext/gosu/extconf.rb

@@ -33,7 +33,7 @@ $CXXFLAGS ||= ""
 $CXXFLAGS << " -std=gnu++17 -Dregister="
 
 # Make Gosu's own header files and all of its dependencies available to C++ source files.
-$INCFLAGS << " -I../../include -I../../dependencies/stb -I../../dependencies/utf8proc -I../../dependencies/SDL_sound -I../../dependencies/mojoAL"
+$INCFLAGS << " -I../../include -I../../dependencies/stb -I../../dependencies/utf8proc -I../../dependencies/SDL_sound -I../../dependencies/mojoAL/AL"
 
 if windows
   # We statically compile utf8proc into the Gosu binary.

data/include/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 1
 #define GOSU_MINOR_VERSION 4
-#define GOSU_POINT_VERSION 5
+#define GOSU_POINT_VERSION 6
 
 namespace Gosu
 {

data/src/AudioFile.hpp

@@ -8,7 +8,7 @@
 #define OPENAL_DEPRECATED
 #include <OpenAL/al.h>
 #else
-#include <AL/al.h>
+#include <al.h>
 #endif
 
 #include <cstddef>

data/src/AudioFileSDLSound.cpp

@@ -12,7 +12,9 @@
 #include <algorithm>
 #include <memory>
 #include <mutex>
+#include <stdexcept>
 #include <vector>
+#include <stdexcept>
 
 struct Gosu::AudioFile::Impl : private Gosu::Noncopyable
 {

data/src/AudioImpl.hpp

@@ -9,8 +9,8 @@
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
 #else
-#include <AL/al.h>
-#include <AL/alc.h>
+#include <al.h>
+#include <alc.h>
 #endif
 
 namespace Gosu

data/src/Input.cpp

@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <array>
 #include <mutex>
+#include <stdexcept>
 using namespace std;
 
 static void require_sdl_video()
@@ -140,39 +141,42 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
                 }
                 int gamepad_slot = -1;
                 int joystick_instance_id = -1;
+                int i = e->jdevice.which; // SDL2 device_index
 
-                // Loop through attached gamepads as e->jdevice.which cannot be trusted (always 0)
-                for (int i = 0; i < SDL_NumJoysticks(); i++) {
-                    // Prefer the SDL_GameController API...
-                    if (SDL_IsGameController(i)) {
-                        if (SDL_GameController *game_controller = SDL_GameControllerOpen(i)) {
-                            gamepad_slot = available_gamepad_slot_index();
-                            joystick_instance_id = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(game_controller));
-                            if (gamepad_instance_id_is_known(joystick_instance_id)) {
-                                continue;
-                            }
-                            open_game_controllers.emplace_back(
-                                shared_ptr<SDL_GameController>(game_controller, SDL_GameControllerClose)
-                            );
-                        }
-                    }
-                    // ...but fall back on the good, old SDL_Joystick API.
-                    else if (SDL_Joystick *joystick = SDL_JoystickOpen(i)) {
+                if (SDL_IsGameController(i)) {
+                    if (SDL_GameController *game_controller = SDL_GameControllerOpen(i)) {
                         gamepad_slot = available_gamepad_slot_index();
-                        joystick_instance_id = SDL_JoystickInstanceID(joystick);
+                        joystick_instance_id = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(game_controller));
                         if (gamepad_instance_id_is_known(joystick_instance_id)) {
-                            continue;
+                            return true;
                         }
-                        open_joysticks.emplace_back(
-                            shared_ptr<SDL_Joystick>(joystick, SDL_JoystickClose)
+#if SDL_VERSION_ATLEAST(2, 0, 12)
+                        SDL_GameControllerSetPlayerIndex(game_controller, gamepad_slot);
+#endif
+                        open_game_controllers.emplace_back(
+                            shared_ptr<SDL_GameController>(game_controller, SDL_GameControllerClose)
                         );
                     }
-
-                    // Reserve gamepad slot and issue gamepad connection event
-                    if (gamepad_slot >= 0 && joystick_instance_id >= 0) {
-                        gamepad_slots[gamepad_slot] = joystick_instance_id;
-                        enqueue_gamepad_connection_event(gamepad_slot, true, -1);
+                }
+                // ...but fall back on the good, old SDL_Joystick API.
+                else if (SDL_Joystick* joystick = SDL_JoystickOpen(i)) {
+                    gamepad_slot = available_gamepad_slot_index();
+                    joystick_instance_id = SDL_JoystickInstanceID(joystick);
+                    if (gamepad_instance_id_is_known(joystick_instance_id)) {
+                        return true;
                     }
+#if SDL_VERSION_ATLEAST(2, 0, 12)
+                    SDL_JoystickSetPlayerIndex(joystick, gamepad_slot);
+#endif
+                    open_joysticks.emplace_back(
+                        shared_ptr<SDL_Joystick>(joystick, SDL_JoystickClose)
+                    );
+                }
+
+                // Reserve gamepad slot and issue gamepad connection event
+                if (gamepad_slot >= 0 && joystick_instance_id >= 0) {
+                    gamepad_slots[gamepad_slot] = joystick_instance_id;
+                    enqueue_gamepad_connection_event(gamepad_slot, true, -1);
                 }
                 break;
             }