optimisations

[carveJwlIkooP6JGAAIwe30JlM.git] / menu.h

diff --git a/menu.h b/menu.h
index 44feffdf8cec1f2d5b219c61db681d149b591a9f..71b3570d06190c70a133d386719f92369267be5d 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -9,6 +9,7 @@
 #include "audio.h"
 #include "input.h"
 #include "workshop.h"
+#include "respawn.h"
 
 #define MENU_STACK_SIZE 8
 
@@ -210,17 +211,25 @@ static void menu_trigger_item( ent_menuitem *item )
       if( MDL_CONST_PSTREQ( &menu.model, q, "quit" ) ){
          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_static.active_instance = 0;
-         world_static.active_trigger_volume_count = 0;
+         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, "reset" ) ){
+         menu_close();
+         respawn_begin_chooser();
+      }
+
       else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
          menu.credits_open = 1;
       }