X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=737c849e4b892c53e532694ba422259d26010684;hb=fbc68c65e01838feb77f47b30994b45fcc39ebaf;hp=c9865732b6912e4a54a98106ba49ebfc59be294f;hpb=6e96ba64e805ea8a39ca46171e28426c6bc86ab6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/menu.h b/menu.h
index c986573..737c849 100644
--- a/menu.h
+++ b/menu.h
@@ -141,9 +141,9 @@ static void menu_init(void){
 
    vg_linear_clear( vg_mem.scratch );
 
-   mdl_load_array( &menu.model, &menu.items,   "ent_menuitem", alloc );
-   mdl_load_array( &menu.model, &menu.markers, "ent_marker", alloc );
-   mdl_load_array( &menu.model, &menu.cameras, "ent_camera", alloc );
+   MDL_LOAD_ARRAY( &menu.model, &menu.items,   ent_menuitem, alloc );
+   MDL_LOAD_ARRAY( &menu.model, &menu.markers, ent_marker, alloc );
+   MDL_LOAD_ARRAY( &menu.model, &menu.cameras, ent_camera, alloc );
 
    vg_linear_clear( vg_mem.scratch );
 
@@ -154,7 +154,7 @@ static void menu_init(void){
    void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
    mdl_fread_pack_file( &menu.model, &tex0->file, data );
 
-   mdl_async_load_glmesh( &menu.model, &menu.mesh );
+   mdl_async_load_glmesh( &menu.model, &menu.mesh, NULL );
    vg_tex2d_load_qoi_async( data, tex0->file.pack_size, 
                             VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
                             &menu.texture );
@@ -252,9 +252,11 @@ static void menu_trigger_item( ent_menuitem *item ){
          respawn_begin_chooser();
       }
       else if( MDL_CONST_PSTREQ( &menu.model, q, "hub" ) ){
-         srinput.state = k_input_state_resume;
-         menu_close();
-         ent_miniworld_goback();
+         if( world_static.active_instance == k_world_purpose_client ){
+            srinput.state = k_input_state_resume;
+            menu_close();
+            ent_miniworld_goback();
+         }
       }
       else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
          menu.credits_open = 1;