small compression

[carveJwlIkooP6JGAAIwe30JlM.git] / menu.h

diff --git a/menu.h b/menu.h
index 098570608e53248d174e42a745da54ba30bc41db..86f573620f5fa10ecabe789d0a8d09b5590bc3c3 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -430,7 +430,8 @@ static void menu_update(void){
          ent_menuitem *item = mdl_arritm( &menu.items, i );
 
          if( item->type == k_ent_menuitem_type_page ) continue;
-         if( item->type == k_ent_menuitem_type_visual ) continue;
+         if( (item->type == k_ent_menuitem_type_visual) ||
+             (item->type == k_ent_menuitem_type_visual_nocol) ) continue;
          if( item->type == k_ent_menuitem_type_binding ) continue;
          if( !(item->groups & (0x1<<menu.page)) ) continue;
 
@@ -489,6 +490,7 @@ static void menu_update(void){
             
             if( (item->type != k_ent_menuitem_type_page) &&
                 (item->type != k_ent_menuitem_type_visual) &&
+                (item->type != k_ent_menuitem_type_visual_nocol) &&
                 (item->groups & (0x1<<menu.page)) ){
                menu.loc = item;
             }
@@ -560,15 +562,15 @@ static void menu_update(void){
    menu_setitem_type( menu.ctr_steam, k_ent_menuitem_type_disabled );
 
    if( vg_input.display_input_method == k_input_method_kbm )
-      menu_setitem_type( menu.ctr_kbm, k_ent_menuitem_type_visual );
+      menu_setitem_type( menu.ctr_kbm, k_ent_menuitem_type_visual_nocol );
    else{
       if( vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS3 ||
           vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS4 ||
           vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS5 ){
-         menu_setitem_type( menu.ctr_ps, k_ent_menuitem_type_visual );
+         menu_setitem_type( menu.ctr_ps, k_ent_menuitem_type_visual_nocol );
       }
       else {
-         menu_setitem_type( menu.ctr_xbox, k_ent_menuitem_type_visual );
+         menu_setitem_type( menu.ctr_xbox, k_ent_menuitem_type_visual_nocol );
       }
       /* FIXME: Steam/Deck controller detection? */
    }
@@ -707,7 +709,7 @@ static void menu_render(void){
          }
       }
 
-      if( item->type == k_ent_menuitem_type_visual ){
+      if( item->type == k_ent_menuitem_type_visual_nocol ){
          shader_model_menu_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
       }
       else{