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

diff --git a/player.h b/player.h
index bb87028..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);
@@ -45,6 +44,7 @@ struct player_subsystem_interface{
    void(*pose)( void *animator, player_pose *pose );
    void(*post_animate)(void);
    void(*network_animator_exchange)( bitpack_ctx *ctx, void *data );
+   void(*sfx_oneshot)( u8 id, v3f pos, f32 volume );
 
    void *animator_data;
    u32 animator_size;
@@ -94,16 +94,26 @@ struct {
 
    v3f cam_land_punch, cam_land_punch_v;
    ent_gate *gate_waiting;
-   u16 boundary_hash;
-
    int immobile;
 
+   /* 
+    * Network
+    * --------------------------------------------------
+    */
+   u16 boundary_hash;
+   struct net_sfx {
+      u8 system, priority, id;
+      f32 subframe, volume;
+      v3f location;
+   }
+   sfx_buffer[4];
+   u32 sfx_buffer_count;
+
    /*
     * Animation
     * --------------------------------------------------
     */
 
-   struct player_avatar  *playeravatar;
    struct player_ragdoll  ragdoll;
    struct player_model    fallback_model;
 
@@ -121,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 = {
@@ -146,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 );
@@ -160,10 +190,17 @@ 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(void);
+static void player__begin_holdout( v3f offset );
 
 static int localplayer_cmd_respawn( int argc, const char *argv[] );
 static void player_apply_transport_to_cam( m4x3f transport );
 
+static void player__clear_sfx_buffer(void);
+static void player__networked_sfx( u8 system, u8 priority, u8 id, 
+                                   v3f pos, f32 volume );
+static void net_sfx_exchange( bitpack_ctx *ctx, struct net_sfx *sfx );
+static void net_sfx_play( struct net_sfx *sfx );
+
 #endif /* PLAYER_H */