Browse Source

Changed button mapping

changed mapping of previous and next (i.e. wiimote's + and - keys) to
the same as the select and start button
fireclawthefox 9 years ago
parent
commit
719e77a191

+ 2 - 6
panda/src/device/evdevInputDevice.cxx

@@ -768,20 +768,16 @@ map_button(int code) {
     return GamepadButton::action_2();
     return GamepadButton::action_2();
 
 
   case BTN_SELECT:
   case BTN_SELECT:
+  case KEY_PREVIOUS:
     return GamepadButton::back();
     return GamepadButton::back();
 
 
   case BTN_START:
   case BTN_START:
+  case KEY_NEXT:
     return GamepadButton::start();
     return GamepadButton::start();
 
 
   case BTN_MODE:
   case BTN_MODE:
     return GamepadButton::guide();
     return GamepadButton::guide();
 
 
-  case KEY_NEXT:
-    return GamepadButton::next();
-
-  case KEY_PREVIOUS:
-    return GamepadButton::previous();
-
   case BTN_THUMBL:
   case BTN_THUMBL:
     return GamepadButton::lstick();
     return GamepadButton::lstick();
 
 

+ 2 - 8
panda/src/device/linuxJoystickDevice.cxx

@@ -172,10 +172,12 @@ open_device() {
         break;
         break;
 
 
       case BTN_SELECT:
       case BTN_SELECT:
+      case KEY_PREVIOUS:
         handle = GamepadButton::back();
         handle = GamepadButton::back();
         break;
         break;
 
 
       case BTN_START:
       case BTN_START:
+      case KEY_NEXT:
         handle = GamepadButton::start();
         handle = GamepadButton::start();
         break;
         break;
 
 
@@ -183,14 +185,6 @@ open_device() {
         handle = GamepadButton::guide();
         handle = GamepadButton::guide();
         break;
         break;
 
 
-      case KEY_NEXT:
-        handle = GamepadButton::next();
-        break;
-
-      case KEY_PREVIOUS:
-        handle = GamepadButton::previous();
-        break;
-
       case BTN_THUMBL:
       case BTN_THUMBL:
         handle = GamepadButton::lstick();
         handle = GamepadButton::lstick();
         break;
         break;