X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=inline;f=menu.h;h=737c849e4b892c53e532694ba422259d26010684;hb=b7b22a6b33b7a7e6166b3de1fcabf71eb2aed287;hp=243bebfd70fb742ce7084aca2be32733a4892880;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index 243bebf..737c849 100644 --- a/menu.h +++ b/menu.h @@ -11,6 +11,7 @@ #include "workshop.h" #include "respawn.h" #include "gui.h" +#include "ent_miniworld.h" #define MENU_STACK_SIZE 8 @@ -129,7 +130,7 @@ static void menu_close(void){ skaterift.activity = k_skaterift_default; menu.page_depth = 0; menu.page = 0xffffffff; - srinput.enabled = 0; + srinput.state = k_input_state_resume; } static void menu_init(void){ @@ -140,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 ); @@ -153,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 ); @@ -245,24 +246,18 @@ static void menu_trigger_item( ent_menuitem *item ){ vg.window_should_close = 1; } - /* DEPRECATED? */ - else if( MDL_CONST_PSTREQ( &menu.model, q, "reset_nearest" ) ){ - localplayer_cmd_respawn( 0, NULL ); - menu_close(); - } - /* DEPRECATED? */ - else if( MDL_CONST_PSTREQ( &menu.model, q, "reset_home" ) ){ - world_set_active_instance( 0 ); - localplayer.viewable_world = world_current_instance(); - localplayer_cmd_respawn( 1, (const char *[]){"start"} ); - menu_close(); - } + else if( MDL_CONST_PSTREQ( &menu.model, q, "map" ) ){ - else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){ menu_close(); respawn_begin_chooser(); } - + else if( MDL_CONST_PSTREQ( &menu.model, q, "hub" ) ){ + 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; } @@ -430,7 +425,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<