X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=098570608e53248d174e42a745da54ba30bc41db;hb=df9f72d2912a5424d37dfdb02f76aba8f1ed4df1;hp=fa2d5812dd5a31c4892b76a9015f7733105d1eff;hpb=53597f45307d8a2120e3a0bbe71797b216e8750b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/menu.h b/menu.h
index fa2d581..0985706 100644
--- a/menu.h
+++ b/menu.h
@@ -574,12 +574,12 @@ static void menu_update(void){
    }
 }
 
-VG_STATIC void menu_binding_string( char buf[128], u32 pstr );
+static void menu_binding_string( char buf[128], u32 pstr );
 
 /*
  * Run from vg_gui when active
  */
-VG_STATIC void menu_render(void){
+static void menu_render(void){
    glEnable(GL_BLEND);
    glDisable(GL_DEPTH_TEST);
    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
@@ -761,7 +761,7 @@ VG_STATIC void menu_render(void){
    m4x3f local;
    m4x3_identity( local );
 
-   font3d_bind( &gui.font, &menu.view );
+   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &menu.view );
    for( u32 i=0; i<text_count; i++ ){
       ent_menuitem *item = text_list[ i ];
       m4x3f transform;
@@ -769,17 +769,16 @@ VG_STATIC void menu_render(void){
 
       u32 variant = item->binding.font_variant;
       menu_binding_string( buf, item->binding.pstr_bind );
-      f32 offset = font3d_string_width( &gui.font, variant, buf );
+      f32 offset = font3d_string_width( variant, buf );
 
       local[3][0] = -0.5f * offset;
       m4x3_mul( transform, local, transform );
 
-      font3d_simple_draw( &gui.font, variant, k_font_shader_default, buf, 
-                          &menu.view, transform );
+      font3d_simple_draw( variant, buf, &menu.view, transform );
    }
 }
 
-VG_STATIC void menu_binding_string( char buf[128], u32 pstr ){
+static void menu_binding_string( char buf[128], u32 pstr ){
    vg_strncpy( "error", buf, 128, k_strncpy_allow_cutoff );
 
    if( MDL_CONST_PSTREQ( &menu.model, pstr, "bind_jump" ) ){