X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_dead.c;h=72eba265f443c92512051b77b485e41b6e15b030;hb=refs%2Fheads%2Fmaster;hp=5f4ab7260a26cfca7648a0074d01014ecbf10648;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_dead.c b/player_dead.c index 5f4ab72..72eba26 100644 --- a/player_dead.c +++ b/player_dead.c @@ -18,8 +18,12 @@ struct player_subsystem_interface player_subsystem_dead = { .name = "Dead" }; -void player__dead_update(void){ +void player__dead_update(void) +{ player_ragdoll_iter( &localplayer.ragdoll ); + + world_instance *world = world_current_instance(); + world_water_player_safe( world, 0.2f ); } void player__dead_post_update(void){ @@ -157,6 +161,9 @@ void player__dead_im_gui(void) void player__dead_transition( enum player_die_type type ) { + if( localplayer.subsystem == k_player_subsystem_dead ) + return; + localplayer.subsystem = k_player_subsystem_dead; copy_localplayer_to_ragdoll( &localplayer.ragdoll, type ); @@ -171,14 +178,14 @@ void player__dead_transition( enum player_die_type type ) struct gui_helper *h; if( (h = gui_new_helper(input_button_list[k_srbind_reset], &str) )){ - vg_strcat( &str, "rewind" ); + vg_strcat( &str, "Rewind" ); if( world_static.active_instance == k_world_purpose_hub ) h->greyed = 1; } if( gui_new_helper(input_button_list[k_srbind_dead_respawn], &str )) - vg_strcat( &str, "spawn" ); + vg_strcat( &str, "Spawn" ); } void player__dead_animator_exchange( bitpack_ctx *ctx, void *data )