completed all glider stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 5b662b234f9164a60254b6fd8b042cdb4ab673c2..67f78b5df9829e4b66e7405cb1015e8cac3765cb 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -7,13 +7,19 @@
 
 enum gui_icon {
    k_gui_icon_tick    = 0,
+   k_gui_icon_tick_2d,
    k_gui_icon_exclaim,
+   k_gui_icon_exclaim_2d,
    k_gui_icon_board,
    k_gui_icon_world,
    k_gui_icon_rift,
    k_gui_icon_rift_run,
+   k_gui_icon_rift_run_2d,
    k_gui_icon_friend,
    k_gui_icon_player,
+   k_gui_icon_rift_run_gold,
+   k_gui_icon_rift_run_silver,
+   k_gui_icon_glider,
 
    k_gui_icon_count,
 };
@@ -314,13 +320,21 @@ static void gui_init(void){
    mdl_load_metadata_block( &gui.model_icons, alloc );
 
    gui.icons[ k_gui_icon_tick ] = gui_find_icon( "icon_tick" );
+   gui.icons[ k_gui_icon_tick_2d ] = gui_find_icon( "icon_tick2d" );
    gui.icons[ k_gui_icon_exclaim ] = gui_find_icon( "icon_exclaim" );
+   gui.icons[ k_gui_icon_exclaim_2d ] = gui_find_icon( "icon_exclaim2d" );
    gui.icons[ k_gui_icon_board ] = gui_find_icon( "icon_board" );
    gui.icons[ k_gui_icon_world ] = gui_find_icon( "icon_world" );
    gui.icons[ k_gui_icon_rift ] = gui_find_icon( "icon_rift" );
    gui.icons[ k_gui_icon_rift_run ] = gui_find_icon( "icon_rift_run" );
+   gui.icons[ k_gui_icon_rift_run_2d ] = gui_find_icon( "icon_rift_run2d" );
    gui.icons[ k_gui_icon_friend ] = gui_find_icon( "icon_friend" );
    gui.icons[ k_gui_icon_player ] = gui_find_icon( "icon_player" );
+   gui.icons[ k_gui_icon_glider ] = gui_find_icon( "icon_glider" );
+   gui.icons[ k_gui_icon_rift_run_gold ] =
+      gui_find_icon("icon_rift_run_medal_gold");
+   gui.icons[ k_gui_icon_rift_run_silver]=
+      gui_find_icon("icon_rift_run_medal_silver");
 
    vg_linear_clear( vg_mem.scratch );
    if( !mdl_arrcount( &gui.model_icons.textures ) )
@@ -332,7 +346,7 @@ static void gui_init(void){
                             VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
                             &gui.icons_texture );
 
-   mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh );
+   mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh, NULL );
    mdl_close( &gui.model_icons );
 }