X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=3dce2f01a8ffb6e57d802781f26c2c36e51c0ac8;hb=aa4c26eae2208872824e0eb5b71bc05c16d43242;hp=b6c70c04562716bb95ec4f42c9b0ef8b31044964;hpb=06e5d59a9b7fdd96a2e46f49be85089b43df75ae;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index b6c70c0..3dce2f0 100644
--- a/player.h
+++ b/player.h
@@ -6,7 +6,7 @@
 #include "player_common.h"
 #include "player_walk.h"
 #include "player_skate.h"
-//#include "player_dead.h"
+#include "player_dead.h"
 
 struct player_instance
 {
@@ -14,6 +14,9 @@ struct player_instance
    rigidbody rb;
    v3f angles;
 
+   v4f   qbasis;
+   m3x3f basis, invbasis, basis_gate;
+
    /*
     * Camera management
     * ---------------------------
@@ -59,6 +62,9 @@ struct player_instance
                         *input_js2v,
                         *input_jump,
                         *input_push,
+                        *input_trick0,
+                        *input_trick1,
+                        *input_trick2,
                         *input_walk,
                         *input_walkh,
                         *input_walkv,
@@ -77,6 +83,9 @@ struct player_instance
    struct player_ragdoll  ragdoll;
    vg_tex2d              *playertex;
 
+   player_pose            holdout_pose;
+   float                  holdout_time;
+
    /*
     * Subsystems
     * -------------------------------------------------
@@ -92,7 +101,7 @@ struct player_instance
 
    struct player_skate  _skate;
    struct player_walk   _walk;
-   //struct player_dead   _dead;
+   struct player_dead   _dead;
 };
 
 /*
@@ -129,7 +138,7 @@ void( *_player_update[])( player_instance *player ) =
 {
    player__walk_update,
    player__skate_update,
-   NULL
+   player__dead_update,
 };
 
 VG_STATIC 
@@ -153,7 +162,7 @@ void( *_player_animate[])( player_instance *player, player_animation *dest ) =
 {
    player__walk_animate,
    player__skate_animate,
-   NULL
+   player__dead_animate
 };
 
 VG_STATIC
@@ -161,7 +170,7 @@ void( *_player_post_animate[])( player_instance *player ) =
 {
    player__walk_post_animate,
    player__skate_post_animate,
-   NULL
+   player__dead_post_animate
 };
 
 /* implementation */
@@ -170,7 +179,7 @@ void( *_player_post_animate[])( player_instance *player ) =
 #include "player_common.c"
 #include "player_walk.c"
 #include "player_skate.c"
-//#include "player_dead.c"
+#include "player_dead.c"
 
 #endif /* PLAYER_H */