qm3x3,boxf debug, bugfixes
[vg.git] / src / vg / vg_input.h
index bbc2f84dad13c5dc43e86586044eb1eaa7d7c169..2506ba412d7686cde0b8fba74c863aea89e6eccf 100644 (file)
@@ -45,6 +45,7 @@ static struct button_binding
 {
        const char *name;
        int bind;
+   int controller;
        
        int value; int prev;
 }
@@ -126,22 +127,17 @@ void vg_update_inputs(void)
    {
       vg_gamepad_ready = 0;
    }
-   
 
        /* Update button inputs */
        for( int i = 0; i < vg_list_size( vg_button_binds ); i ++ )
        {
                struct button_binding *binding = vg_button_binds + i;
                binding->prev = binding->value;
-       
-               if( vg_input_mode == k_EInputMode_pc )
-               {
-                       binding->value = get_button_cross_device( binding->bind );
-               }
-               else
-               {
-                       binding->value = vg_gamepad.buttons[ binding->bind ];
-               }
+          
+      if( binding->controller )
+         binding->value = vg_gamepad.buttons[ binding->controller ];
+      else
+         binding->value = get_button_cross_device( binding->bind );
        }
        
        /* Update axis inputs */