We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch fixing the controllermap bug.

controllermap_patch_parent_8633:05237b5e8366.diff (text/plain), 2.31 KB, created by Bogdan Marinov on 2014-03-19 22:03:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Marinov

Created: 2014-03-19 22:03:58 UTC

Size: 2.31 KB

patch

obsolete

>diff -r 05237b5e8366 test/controllermap.c
>--- a/test/controllermap.c	Tue Mar 18 12:53:01 2014 -0400
>+++ b/test/controllermap.c	Tue Mar 18 21:59:53 2014 +0200
>@@ -119,19 +119,19 @@
>         {389, 101,  0.0,  MARKER_BUTTON, "y", -1, -1, -1, -1, ""},
>         {174, 132,  0.0,  MARKER_BUTTON, "back", -1, -1, -1, -1, ""},
>         {233, 132,  0.0,  MARKER_BUTTON, "guide", -1, -1, -1, -1, ""},
>-        {289, 132,  0.0,  MARKER_BUTTON, "start", -1, -1, -1, -1, ""},        
>+        {289, 132,  0.0,  MARKER_BUTTON, "start", -1, -1, -1, -1, ""},
>         {116, 217,  0.0,  MARKER_BUTTON, "dpleft", -1, -1, -1, -1, ""},
>         {154, 249,  0.0,  MARKER_BUTTON, "dpdown", -1, -1, -1, -1, ""},
>         {186, 217,  0.0,  MARKER_BUTTON, "dpright", -1, -1, -1, -1, ""},
>         {154, 188,  0.0,  MARKER_BUTTON, "dpup", -1, -1, -1, -1, ""},
>         {77,  40,   0.0,  MARKER_BUTTON, "leftshoulder", -1, -1, -1, -1, ""},
>-        {91, 0,    0.0,  MARKER_BUTTON, "lefttrigger", -1, -1, -1, -1, ""},
>+        {91,  0,    0.0,  MARKER_BUTTON, "lefttrigger", -1, -1, -1, -1, ""},
>         {396, 36,   0.0,  MARKER_BUTTON, "rightshoulder", -1, -1, -1, -1, ""},
>         {375, 0,    0.0,  MARKER_BUTTON, "righttrigger", -1, -1, -1, -1, ""},
>         {75,  154,  0.0,  MARKER_BUTTON, "leftstick", -1, -1, -1, -1, ""},
>         {305, 230,  0.0,  MARKER_BUTTON, "rightstick", -1, -1, -1, -1, ""},
>         {75,  154,  0.0,  MARKER_AXIS,   "leftx", -1, -1, -1, -1, ""},
>-        {75,  154,  90.0, MARKER_AXIS,   "lefty", -1, -1, -1, -1, ""},        
>+        {75,  154,  90.0, MARKER_AXIS,   "lefty", -1, -1, -1, -1, ""},
>         {305, 230,  0.0,  MARKER_AXIS,   "rightx", -1, -1, -1, -1, ""},
>         {305, 230,  90.0, MARKER_AXIS,   "righty", -1, -1, -1, -1, ""},
>     };
>@@ -296,8 +296,8 @@
>                     if (event.key.keysym.sym == SDLK_BACKSPACE || event.key.keysym.sym == SDLK_AC_BACK) {
>                         /* Undo! */
>                         if (s > 0) {
>-                            SDL_strlcpy(mapping, step->mapping, SDL_arraysize(step->mapping));
>-                            s--;
>+                            MappingStep *prev_step = &steps[--s];
>+                            SDL_strlcpy(mapping, prev_step->mapping, SDL_arraysize(prev_step->mapping));
>                             next = SDL_TRUE;
>                         }
>                         break;

Actions: View | Diff

Attachments on bug 2456: 1597

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.