update helpers/location to 'frosted' ui

[carveJwlIkooP6JGAAIwe30JlM.git] / player.c

diff --git a/player.c b/player.c
index b11eacb1777618a4d66740358ebf939cec038b89..a60c8c2613aae02452ee8aae98bd0be3724847ab 100644 (file)
--- a/player.c
+++ b/player.c
@@ -22,6 +22,7 @@
 #include "player_skate.h"
 #include "player_basic_info.h"
 #include "player_glide.h"
+#include <string.h>
 
 i32 k_invert_y = 0;
 struct localplayer localplayer = 
@@ -296,10 +297,10 @@ void player__clean_refs(void)
 
    world_static.challenge_target = NULL;
    world_static.challenge_timer = 0.0f;
-   world_static.focused_entity = 0;
    world_static.active_trigger_volume_count = 0;
    world_static.last_use = 0.0;
-   world_entity_unfocus();
+   world_entity_exit_modal();
+   world_entity_clear_focus();
 
    localplayer.boundary_hash ^= NETMSG_BOUNDARY_BIT;
 
@@ -329,6 +330,7 @@ void player__reset(void)
    localplayer.gate_waiting = NULL;
    localplayer.have_glider = 0;
    localplayer.glider_orphan = 0;
+   localplayer.drowned = 0;
 
    v3_copy( localplayer.rb.co, localplayer.cam_control.tpv_lpf );
    player__clean_refs();