oops

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 984fcef7cf6489a1ab1db7beadb605d3a4a72888..ec24b865a130c314a085a9bf1875ed18ce705f47 100644 (file)
--- a/player.h
+++ b/player.h
@@ -13,8 +13,11 @@
 #define PLAYER_REWIND_FRAMES 60*4
 #define RESET_MAX_TIME 45.0
 
-struct player_instance
-{
+static i32 k_cinema_fixed = 0;
+static f32 k_cinema       = 0.0f;
+static i32 k_invert_y     = 0;
+
+struct player_instance{
    /* transform definition */
    rigidbody rb, rb_gate_storage;
    v3f angles, angles_storage;
@@ -49,6 +52,7 @@ struct player_instance
    v3f cam_override_angles;
    float cam_override_fov;
    float cam_override_strength;
+   f32 cam_trackshake;
 
    float cam_velocity_influence,
          cam_velocity_coefficient,
@@ -69,10 +73,10 @@ struct player_instance
     */
 
    struct player_avatar  *playeravatar;
-   struct player_model   *playermodel;
    struct player_ragdoll  ragdoll;
-   //struct player_board   *board;
-   struct cache_board  *board_view_slot;
+   struct player_model    fallback_model;
+
+   u16 board_view_slot, playermodel_view_slot;
 
    player_pose            holdout_pose;
    float                  holdout_time;
@@ -218,6 +222,8 @@ PLAYER_API void player__use_avatar( player_instance *player,
                                     struct player_avatar *av );
 PLAYER_API void player__use_mesh( player_instance *player, glmesh *mesh );
 PLAYER_API void player__use_texture( player_instance *player, vg_tex2d *tex );
+PLAYER_API void player__use_model( player_instance *player, u16 reg_id );
+
 PLAYER_API void player__bind( player_instance *player );
 PLAYER_API void player__pre_update( player_instance *player );
 PLAYER_API void player__update( player_instance *player );
@@ -225,6 +231,7 @@ PLAYER_API void player__post_update( player_instance *player );
 
 PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate );
 PLAYER_API void player__im_gui( player_instance *player );
+PLAYER_API void player__setpos( player_instance *player, v3f pos );
 PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
 PLAYER_API void player__kill( player_instance *player );