X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=d7c422d38d2beaf66959a3a5e9f65122d2a620a7;hb=b3b0d3d852f102147c6306f71818013e51e1687e;hp=d5eb90f058269df735649efe2e6cd162d5841a29;hpb=166bd43e677bb4406197407a381b27058582c548;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/menu.h b/menu.h
index d5eb90f..d7c422d 100644
--- a/menu.h
+++ b/menu.h
@@ -24,10 +24,19 @@ VG_STATIC u32         menu_page     = 0;
 VG_STATIC int         cl_menu         = 0,
                       cl_menu_go_away = 0;
 
+VG_STATIC int         menu_enabled(void){ return cl_menu; }
+
 VG_STATIC const char *playermodels[] = { "ch_new", "ch_jordan", "ch_outlaw" };
 
 vg_tex2d tex_menu = { .path = "textures/menu.qoi",.flags = VG_TEXTURE_NEAREST };
 
+VG_STATIC struct input_binding input_menu_h,
+                               input_menu_v,
+                               input_menu_press,
+                               input_menu_back,
+                               input_menu_toggle,
+                               input_menu_toggle_kbm;
+
 VG_STATIC void menu_btn_paused( int event );
 VG_STATIC void menu_btn_quit( int event );
 VG_STATIC void menu_btn_skater( int event );
@@ -120,6 +129,26 @@ VG_STATIC void steam_on_game_overlay( CallbackMsg_t *msg )
 
 VG_STATIC void menu_init(void)
 {
+   vg_create_unnamed_input( &input_menu_h, k_input_type_axis );
+   vg_create_unnamed_input( &input_menu_v, k_input_type_axis );
+   vg_create_unnamed_input( &input_menu_back, k_input_type_button );
+   vg_create_unnamed_input( &input_menu_press, k_input_type_button );
+   vg_create_unnamed_input( &input_menu_toggle, k_input_type_button );
+   vg_create_unnamed_input( &input_menu_toggle_kbm, k_input_type_button );
+
+   vg_apply_bind_str( &input_menu_h, "", "gp-ls-h" );
+   vg_apply_bind_str( &input_menu_h, "+", "d" );
+   vg_apply_bind_str( &input_menu_h, "-", "a" );
+   vg_apply_bind_str( &input_menu_v, "", "-gp-ls-v" );
+   vg_apply_bind_str( &input_menu_v, "+", "w" );
+   vg_apply_bind_str( &input_menu_v, "-", "s" );
+   vg_apply_bind_str( &input_menu_press, "", "gp-a" );
+   vg_apply_bind_str( &input_menu_press, "", "e" );
+   vg_apply_bind_str( &input_menu_back, "", "gp-b" );
+   vg_apply_bind_str( &input_menu_back, "", "\2escape" );
+   vg_apply_bind_str( &input_menu_toggle_kbm, "", "\2escape" );
+   vg_apply_bind_str( &input_menu_toggle, "", "\2gp-menu" );
+
    vg_linear_clear( vg_mem.scratch );
 
    mdl_open( &menu_model, "models/rs_menu.mdl" );
@@ -154,7 +183,7 @@ VG_STATIC void menu_run_directional(void)
 {
    struct menu_button *btn = &menu_buttons[ menu_loc ];
 
-   if( vg_get_button_down( "jump" ) )
+   if( vg_input_button_down( &input_menu_press ) )
    {
       if( btn->fn_press )
       {
@@ -169,7 +198,8 @@ VG_STATIC void menu_run_directional(void)
 
    if( menu_input_cooldown <= 0.0f )
    {
-      v2f dir = { vg_get_axis( "lookh" ), vg_get_axis( "lookv" ) };
+      v2f dir = {  input_menu_h.axis.value,
+                  -input_menu_v.axis.value };
 
       if( v2_length2( dir ) > 0.8f*0.8f )
       {
@@ -200,7 +230,7 @@ VG_STATIC void menu_run_directional(void)
 
 VG_STATIC int menu_page_should_backout(void)
 {
-   return vg_get_button_down( "break" );
+   return vg_input_button_down( &input_menu_back );
 }
 
 VG_STATIC void menu_close(void)
@@ -247,7 +277,7 @@ VG_STATIC void menu_page_quit(void)
 
 VG_STATIC void menu_page_skater(void)
 {
-   float h = vg_get_axis( "lookh" );
+   float h = input_menu_h.axis.value;
    menu_fov_target = 97.0f;
 
    if( menu_page_should_backout() )
@@ -290,28 +320,48 @@ VG_STATIC void menu_page_skater(void)
 
 VG_STATIC void menu_update(void)
 {
-   if( vg_get_button_down( "menu" ) )
+   vg_input_update( 1, &input_menu_h );
+   vg_input_update( 1, &input_menu_v );
+   vg_input_update( 1, &input_menu_back );
+   vg_input_update( 1, &input_menu_press );
+   vg_input_update( 1, &input_menu_toggle );
+   vg_input_update( 1, &input_menu_toggle_kbm );
+
+   int toggle_gp = vg_input_button_down( &input_menu_toggle ),
+       toggle_kb = vg_input_button_down( &input_menu_toggle_kbm ),
+       wait_for_a_sec = 0;
+
+   if( toggle_gp || toggle_kb )
    {
       if( cl_menu )
       {
-         cl_menu_go_away = 1;
-         menu_page = 0;
+         if( toggle_gp )
+         {
+            cl_menu_go_away = 1;
+            menu_page = 0;
+         }
       }
       else
       {
+         if( toggle_kb )
+            wait_for_a_sec = 1;
+
          cl_menu = 1;
          menu_page = 1;
       }
    }
 
-   if( menu_page == 1 )
-      menu_page_main();
-   else if( menu_page == 2 )
-      menu_page_skater();
-   else if( menu_page == 4 )
-      menu_page_map();
-   else if( menu_page == 8 )
-      menu_page_quit();
+   if( !wait_for_a_sec )
+   {
+      if( menu_page == 1 )
+         menu_page_main();
+      else if( menu_page == 2 )
+         menu_page_skater();
+      else if( menu_page == 4 )
+         menu_page_map();
+      else if( menu_page == 8 )
+         menu_page_quit();
+   }
 
    struct menu_button *btn = &menu_buttons[ menu_loc ];