refactor(1)

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 984fcef7cf6489a1ab1db7beadb605d3a4a72888..8f1e3c6be4ae9ed96c3538b49294eeb6c440ffe5 100644 (file)
--- a/player.h
+++ b/player.h
@@ -13,6 +13,10 @@
 #define PLAYER_REWIND_FRAMES 60*4
 #define RESET_MAX_TIME 45.0
 
+static i32 k_cinema_fixed = 0;
+static f32 k_cinema       = 0.0f;
+static i32 k_invert_y     = 0;
+
 struct player_instance
 {
    /* transform definition */
@@ -49,6 +53,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 +74,17 @@ struct player_instance
     */
 
    struct player_avatar  *playeravatar;
-   struct player_model   *playermodel;
    struct player_ragdoll  ragdoll;
+
+#if 0
+   //struct player_model   *playermodel;
    //struct player_board   *board;
-   struct cache_board  *board_view_slot;
+   
+   struct cache_board       *board_view_slot;
+   struct cache_playermodel *playermodel_view_slot;
+#endif
+
+   u16 board_view_slot, playermodel_view_slot;
 
    player_pose            holdout_pose;
    float                  holdout_time;