equal
deleted
inserted
replaced
98 QString prefix = QString("%1 (%2): ").arg(joyname).arg(jid + 1); |
98 QString prefix = QString("%1 (%2): ").arg(joyname).arg(jid + 1); |
99 |
99 |
100 // Register entries for missing axes not assigned to sticks of this joystick/gamepad |
100 // Register entries for missing axes not assigned to sticks of this joystick/gamepad |
101 for(int aid = 0; aid < SDL_JoystickNumAxes(joy) && i < 1021; aid++) |
101 for(int aid = 0; aid < SDL_JoystickNumAxes(joy) && i < 1021; aid++) |
102 { |
102 { |
103 // Axis 2 on xbox 360 is left/right trigger but those are used as buttons anyway so skip it |
|
104 if(aid == 2 && isxb) |
|
105 continue; |
|
106 |
|
107 // Again store the part of the string not changing for multiple uses |
103 // Again store the part of the string not changing for multiple uses |
108 QString axis = prefix + QApplication::translate("binds (keys)", "Axis") + QString(" %1 ").arg(aid + 1); |
104 QString axis = prefix + QApplication::translate("binds (keys)", "Axis") + QString(" %1 ").arg(aid + 1); |
109 |
105 |
110 // Entry for "Axis Up" |
106 // Entry for "Axis Up" |
111 sprintf(sdlkeys[i][0], "j%da%du", jid, aid); |
107 sprintf(sdlkeys[i][0], "j%da%du", jid, aid); |