Fixed handle opening, moved screenshake rumble out of rendering

The controllerRumble function has been cleaned up and now
iterates over the map of connected controllers instead of
opening handles each time rumble is used. The screenshake
rumble functions have been moved into the title and game
logic loops.

Author: Fussmatte

desktop_version/src/Graphics.cpp

@@ -12,7 +12,6 @@
 #include "Font.h"
 #include "GraphicsUtil.h"
 #include "Localization.h"
-#include "KeyPoll.h"
 #include "Map.h"
 #include "Maths.h"
 #include "Music.h"
@@ -3185,8 +3184,6 @@ void Graphics::screenshake(void)
     clear();
 
     copy_texture(tempShakeTexture, NULL, NULL, 0, NULL, flipmode ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE);
-
-    key.controllerRumble(0x7FFF,10);
 }
 
 void Graphics::updatescreenshake(void)

desktop_version/src/KeyPoll.cpp

@@ -499,17 +499,23 @@ bool KeyPoll::controllerWantsDown(void)
 
 int KeyPoll::controllerRumble(Uint16 intensity, Uint32 duration_ms)
 {
+    int result = -1;
     if (game.rumble)
     {
-        SDL_Event evt;
-        SDL_GameController *toOpen = SDL_GameControllerOpen(evt.cdevice.which);
-        return SDL_GameControllerRumble(toOpen,intensity,intensity,duration_ms);
+        std::map<SDL_JoystickID, SDL_GameController*>::iterator it;
+        for (it = controllers.begin(); it != controllers.end(); it++)
+        {
+            int thisController = SDL_GameControllerRumble(it->second,intensity,intensity,duration_ms);
+            if (result != 0)
+            {
+                result = thisController;
+            }
+        }
     }
+    return result; // Returns -1 if rumble is off/no controller supported rumble, 0 if any controller succeeded
 }
 
 int KeyPoll::controllerRumbleStop(void)
 {
-    SDL_Event evt;
-    SDL_GameController *toOpen = SDL_GameControllerOpen(evt.cdevice.which);
-    return SDL_GameControllerRumble(toOpen,0,0,0);
+    return controllerRumble(0,0);
 }

desktop_version/src/Logic.cpp

@@ -5,6 +5,7 @@
 #include "Game.h"
 #include "GlitchrunnerMode.h"
 #include "Graphics.h"
+#include "KeyPoll.h"
 #include "Map.h"
 #include "Music.h"
 #include "Network.h"
@@ -40,6 +41,11 @@ void titlelogic(void)
             game.createmenu(game.menudest, true);
         }
     }
+
+    if (game.screenshake > 0)
+    {
+        key.controllerRumble(0x7FFF,10);
+    }
 }
 
 void maplogic(void)
@@ -173,6 +179,11 @@ void gamelogic(void)
         }
     }
 
+    if (game.screenshake > 0)
+    {
+        key.controllerRumble(0x7FFF,10);
+    }
+
     //Misc
     if (map.towermode)
     {