X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=2b7519a01b5b1db790ca5c4a7708deef9dd22f3f;hb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;hp=c718c5ac57eb4ccc66f5cc311ab472001293ddcb;hpb=6ba5c35d106d749a1ebafbd3cbe18c3a02f781d3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index c718c5a..2b7519a 100644
--- a/player.h
+++ b/player.h
@@ -36,7 +36,6 @@ struct player_cam_controller {
 struct player_subsystem_interface{
    void(*system_register)(void);
    void(*bind)(void);
-   void(*reset)( ent_spawn *rp );
    void(*pre_update)(void);
    void(*update)(void);
    void(*post_update)(void);
@@ -115,7 +114,6 @@ struct {
     * --------------------------------------------------
     */
 
-   struct player_avatar  *playeravatar;
    struct player_ragdoll  ragdoll;
    struct player_model    fallback_model;
 
@@ -133,6 +131,27 @@ struct {
     */
 
    enum player_subsystem subsystem; /* .. prev */
+
+   /*
+    * Rendering
+    */
+   mdl_context skeleton_meta;
+   struct skeleton skeleton;
+
+   u32 id_hip,
+       id_chest,
+       id_ik_hand_l,
+       id_ik_hand_r,
+       id_ik_elbow_l,
+       id_ik_elbow_r,
+       id_head,
+       id_ik_foot_l,
+       id_ik_foot_r,
+       id_ik_knee_l,
+       id_ik_knee_r,
+       id_wheel_l,
+       id_wheel_r,
+       id_board;
 }
 static localplayer = {
    .rb = {
@@ -158,7 +177,6 @@ struct player_subsystem_interface static *player_subsystems[] = {
  */
 
 static void player__debugtext( int size, const char *fmt, ... );
-static void player__use_avatar( struct player_avatar *av );
 static void player__use_mesh( glmesh *mesh );
 static void player__use_texture( vg_tex2d *tex );
 static void player__use_model( u16 reg_id );
@@ -172,6 +190,7 @@ static void player__pass_gate( u32 id );
 static void player__im_gui(void);
 static void player__setpos( v3f pos );
 static void player__spawn( ent_spawn *rp );
+static void player__reset(void);
 static void player__kill(void);
 static void player__begin_holdout( v3f offset );