X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=aa8e609b31c0cfbf119f4d5d6a3bfb3bef24223a;hb=f7c3600e850cc57df80d70c1862cf554c0cf4502;hp=0a49777e14e4b1c740e2d59cb34b9ffa0259c3c7;hpb=70ff4a83e5a4b35436388d9bb999c939559ac23f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index 0a49777..aa8e609 100644 --- a/menu.h +++ b/menu.h @@ -246,21 +246,18 @@ static void menu_trigger_item( ent_menuitem *item ){ vg.window_should_close = 1; } - else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){ - - /* FIXME: Should only be availible in CLIENT WORLD */ + else if( MDL_CONST_PSTREQ( &menu.model, q, "map" ) ){ menu_close(); respawn_begin_chooser(); - - /* FIXME: Need a back to hub button */ -#if 0 - srinput.state = k_input_state_resume; - menu_close(); - ent_miniworld_goback(); -#endif } - + 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; }