update helpers

[carveJwlIkooP6JGAAIwe30JlM.git] / menu.h

diff --git a/menu.h b/menu.h
index 5143c511cf122ff6d862093ce3748283365a814c..5218485c8574ca036b4906b6685369d37fd0ddc4 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -781,38 +781,32 @@ static void menu_render(void){
 }
 
 static void menu_binding_string( char buf[128], u32 pstr ){
-   vg_strncpy( "error", buf, 128, k_strncpy_allow_cutoff );
+   vg_str str;
+   vg_strnull( &str, buf, 128 );
 
    if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_jump" ) ){
-      vg_strncpy( button_display_string(k_srbind_jump), buf, 128, 
-                  k_strncpy_allow_cutoff );
+      vg_input_string( &str, input_button_list[k_srbind_jump], 1 );
    }
    else if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_trick0" ) ){
-      vg_str str;
-      vg_strnull( &str, buf, 128 );
       vg_strcat( &str, "SHUVIT " );
-      vg_strcat( &str, button_display_string(k_srbind_trick0) );
+      vg_input_string( &str, input_button_list[k_srbind_trick0], 1 );
    }
    else if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_trick1" ) ){
-      vg_str str;
-      vg_strnull( &str, buf, 128 );
       vg_strcat( &str, "KICKFLIP " );
-      vg_strcat( &str, button_display_string(k_srbind_trick1) );
+      vg_input_string( &str, input_button_list[k_srbind_trick1], 1 );
    }
    else if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_trick2" ) ){
-      vg_str str;
-      vg_strnull( &str, buf, 128 );
       vg_strcat( &str, "TREFLIP " );
-      vg_strcat( &str, button_display_string(k_srbind_trick2) );
+      vg_input_string( &str, input_button_list[k_srbind_trick2], 1 );
    }
    else if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_grab" ) ){
-      vg_strncpy( axis_display_string(k_sraxis_grab), buf, 128,
-                  k_strncpy_allow_cutoff );
+      vg_input_string( &str, input_axis_list[k_sraxis_grab], 1 );
    }
    else if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_grab_mod" ) ){
-      vg_strncpy( joystick_display_string(k_srjoystick_grab, 2), buf, 128,
-                  k_strncpy_allow_cutoff );
+      vg_input_string( &str, input_joy_list[k_srjoystick_grab], 1 );
    }
+   else
+      vg_strcat( &str, "error" );
 }
 
 #endif /* MENU_H */