X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=fcf2da4c28a6abb47855a82f212f9962b9abccf9;hb=6929408e937dca64da707a2d61f8cdf6ab857e93;hp=488684320ada8a01ef8ad116502956ff54580111;hpb=70af79f5399777cdc69cc6939d29df694318ff8d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index 4886843..fcf2da4 100644 --- a/menu.h +++ b/menu.h @@ -5,7 +5,6 @@ #include "model.h" #include "world_render.h" #include "player.h" -#include "conf.h" #include "shaders/model_menu.h" #include "audio.h" #include "input.h" @@ -207,13 +206,23 @@ static void menu_trigger_item( ent_menuitem *item ) if( MDL_CONST_PSTREQ( &menu.model, q, "quit" ) ){ vg.window_should_close = 1; } - else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){ + else if( MDL_CONST_PSTREQ( &menu.model, q, "reset_nearest" ) ){ localplayer_cmd_respawn( 0, NULL ); menu.page_depth = 0; menu.active = 0; menu.page = 0xffffffff; } + else if( MDL_CONST_PSTREQ( &menu.model, q, "reset_home" ) ){ + world_static.active_world = 0; + world_static.active_trigger_volume_count = 0; + localplayer.viewable_world = world_current_instance(); + localplayer_cmd_respawn( 1, (const char *[]){"start"} ); + + menu.page_depth = 0; + menu.active = 0; + menu.page = 0xffffffff; + } else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){ menu.credits_open = 1; }