X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=8f1e3c6be4ae9ed96c3538b49294eeb6c440ffe5;hb=cbeec2e44e93ab43ccde54c2dd9cd02f559ebef8;hp=0a7486013716a670bfb57de29e7c031550f29ed1;hpb=f24a8cdd8ea6c3d762d26de2fc0700599bedbcad;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index 0a74860..8f1e3c6 100644
--- 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,15 +53,16 @@ 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,
          cam_velocity_constant,
          cam_velocity_coefficient_smooth,
          cam_velocity_constant_smooth,
-         cam_velocity_influence_smooth,
-         cam_land_punch,
-         cam_land_punch_v;
+         cam_velocity_influence_smooth;
+
+   v3f cam_land_punch, cam_land_punch_v;
 
    ent_gate *gate_waiting;
 
@@ -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 dynamic_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;
@@ -228,15 +240,7 @@ PLAYER_API void player__im_gui( player_instance *player );
 PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
 PLAYER_API void player__kill( player_instance *player );
 
-/* implementation */
-
-#include "player.c"
-#include "player_common.c"
-#include "player_walk.c"
-#include "player_skate.c"
-#include "player_dead.c"
-#include "player_drive.c"
-#include "player_render.c"
-#include "player_ragdoll.c"
+VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] );
+VG_STATIC void player_apply_transport_to_cam( m4x3f transport );
 
 #endif /* PLAYER_H */