X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_dead.c;h=1dd8c7619388ef1004e5d7e985540100e9298560;hb=304647a7672165dd35ffe54884ed9aedcc9bf363;hp=625ff0e7643cae2dfb8c0d4c5a4cb9dc93cd1789;hpb=217627b6b4eef904ac89b5f7f7f819b3a0970b20;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_dead.c b/player_dead.c
index 625ff0e..1dd8c76 100644
--- a/player_dead.c
+++ b/player_dead.c
@@ -1,14 +1,32 @@
-#ifndef PLAYER_DEAD_C
-#define PLAYER_DEAD_C
-
-#include "player.h"
+#include "skaterift.h"
+#include "player_dead.h"
 #include "gui.h"
 
-static void player__dead_update(void){
+struct player_dead player_dead;
+struct player_subsystem_interface player_subsystem_dead = {
+   .update = player__dead_update,
+   .post_update = player__dead_post_update,
+   .animate = player__dead_animate,
+   .pose = player__dead_pose,
+   .post_animate = player__dead_post_animate,
+   .im_gui = player__dead_im_gui,
+   .bind = player__dead_bind,
+
+   .animator_data = &player_dead.animator,
+   .animator_size = sizeof(player_dead.animator),
+   .network_animator_exchange = player__dead_animator_exchange,
+   .name = "Dead"
+};
+
+void player__dead_update(void)
+{
    player_ragdoll_iter( &localplayer.ragdoll );
+
+   world_instance *world = world_current_instance();
+   world_water_player_safe( world, 0.2f );
 }
 
-static void player__dead_post_update(void){
+void player__dead_post_update(void){
    struct ragdoll_part *part = 
       &localplayer.ragdoll.parts[ localplayer.id_hip-1 ];
    struct player_dead *d = &player_dead;
@@ -41,7 +59,7 @@ static void player__dead_post_update(void){
    }
 }
 
-static void player__dead_animate(void){
+void player__dead_animate(void){
    struct player_dead *d = &player_dead;
    struct player_dead_animator *animator = &d->animator;
    struct player_ragdoll *rd = &localplayer.ragdoll;
@@ -113,7 +131,8 @@ static void player__dead_animate(void){
    }
 }
 
-static void player__dead_pose( void *_animator, player_pose *pose ){
+void player__dead_pose( void *_animator, player_pose *pose )
+{
    struct player_dead_animator *animator = _animator;
    struct player_ragdoll *rd = &localplayer.ragdoll;
    struct skeleton *sk = &localplayer.skeleton;
@@ -131,14 +150,20 @@ static void player__dead_pose( void *_animator, player_pose *pose ){
    }
 }
 
-static void player__dead_post_animate(void){
+void player__dead_post_animate(void)
+{
    localplayer.cam_velocity_influence = 1.0f;
 }
 
-static void player__dead_im_gui(void){
+void player__dead_im_gui(void)
+{
 }
 
-static void player__dead_transition( enum player_die_type type ){
+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 );
 
@@ -163,7 +188,8 @@ static void player__dead_transition( enum player_die_type type ){
       vg_strcat( &str, "spawn" );
 }
 
-static void player__dead_animator_exchange( bitpack_ctx *ctx, void *data ){
+void player__dead_animator_exchange( bitpack_ctx *ctx, void *data )
+{
    struct player_dead_animator *animator = data;
 
    for( u32 i=0; i<localplayer.skeleton.bone_count; i ++ ){
@@ -172,9 +198,8 @@ static void player__dead_animator_exchange( bitpack_ctx *ctx, void *data ){
    }
 }
 
-static void player__dead_bind(void){
+void player__dead_bind(void)
+{
    struct skeleton *sk = &localplayer.skeleton;
    player_dead.anim_bail = skeleton_get_anim( sk, "pose_bail_ball" );
 }
-
-#endif /* PLAYER_DEAD_C */