Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hwengine crash when using >1 controllers
authorWuzzy <Wuzzy2@mail.ru>
Mon, 16 Jul 2018 20:28:01 +0200
changeset 13490 4faebbf9c44f
parent 13489 8935dcc0e130
child 13491 f725701ca529
Fix hwengine crash when using >1 controllers Reason: Data type mismatch for SDL_JoystickName, we wed in an index, but it expected a controller handle. Solution: Switch to SDL_JoystickNameForIndex.
hedgewars/SDLh.pas file | annotate | diff | comparison | revisions
hedgewars/uInputHandler.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/SDLh.pas	Mon Jul 16 19:15:22 2018 +0200
+++ b/hedgewars/SDLh.pas	Mon Jul 16 20:28:01 2018 +0200
@@ -1165,7 +1165,7 @@
 procedure SDL_UnlockAudio; cdecl; external SDLLibName;
 
 function  SDL_NumJoysticks: LongInt; cdecl; external SDLLibName;
-function  SDL_JoystickName(idx: LongInt): PChar; cdecl; external SDLLibName;
+function  SDL_JoystickNameForIndex(idx: LongInt): PChar; cdecl; external SDLLibName;
 function  SDL_JoystickOpen(idx: LongInt): PSDL_Joystick; cdecl; external SDLLibName;
 function  SDL_JoystickOpened(idx: LongInt): LongInt; cdecl; external SDLLibName;
 function  SDL_JoystickIndex(joy: PSDL_Joystick): LongInt; cdecl; external SDLLibName;
--- a/hedgewars/uInputHandler.pas	Mon Jul 16 19:15:22 2018 +0200
+++ b/hedgewars/uInputHandler.pas	Mon Jul 16 20:28:01 2018 +0200
@@ -514,10 +514,10 @@
     begin
     for j:= 0 to pred(ControllerNumControllers) do
         begin
-        WriteLnToConsole('Using game controller: ' + shortstring(SDL_JoystickName(j)));
+        WriteLnToConsole('Game controller no. ' + IntToStr(j) + ', name "' + shortstring(SDL_JoystickNameForIndex(j)) + '":');
         Controller[j]:= SDL_JoystickOpen(j);
         if Controller[j] = nil then
-            WriteLnToConsole('* Failed to open game controller!')
+            WriteLnToConsole('* Failed to open game controller no. ' + IntToStr(j) + '!')
         else
             begin
             ControllerNumAxes[j]:= SDL_JoystickNumAxes(Controller[j]);
hedgewars