basic replayable replays

[carveJwlIkooP6JGAAIwe30JlM.git] / menu.h

diff --git a/menu.h b/menu.h
index 32291c1c6e2a10855779c1377366181336a2cf8a..9f62242cc42de8589ea94d679bcca2260de0a7f3 100644 (file)
--- 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"
@@ -15,7 +14,6 @@
 
 struct {
    int active, credits_open;
-   f32 factive;
    int disable_open;
 
    u32 page, /* current page index */
@@ -207,13 +205,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;
       }
@@ -274,9 +282,6 @@ static void menu_update(void)
       }
    }
 
-   menu.factive = vg_lerpf( menu.factive, menu.active, 
-                            vg.time_frame_delta * 6.0f );
-
    if( !menu.active ) return;
 
    enum menu_input_mode prev_mode = menu.input_mode;
@@ -521,7 +526,8 @@ VG_STATIC void menu_render(void)
    shader_blitcolour_uColour( colour );
    render_fsquad();
 
-   if( workshop_form.page != k_workshop_form_hidden ){
+   if( (workshop_form.page != k_workshop_form_hidden) ||
+       (vg_ui.focused_control_type != k_ui_control_none) ){
       return;
    }