X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=1e3ba671cad5c63d70561bdab470fd8d5a6a3c91;hb=223e75026f958029f9664380ed20a5daa3ee2ae7;hp=dac0db44fd121079074b0ee2b19227c99ef4e7ba;hpb=1b522daa02f28128498b04def4d60b63e590d1f3;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index dac0db4..1e3ba67 100644 --- a/player.h +++ b/player.h @@ -46,7 +46,8 @@ struct player_instance cam_velocity_smooth; v3f cam_override_pos; - v2f cam_override_angles; + v3f cam_override_angles; + float cam_override_fov; float cam_override_strength; float cam_velocity_influence, @@ -60,37 +61,17 @@ struct player_instance ent_gate *gate_waiting; - /* - * Input - * -------------------------------- - */ - struct input_binding *input_js1h, - *input_js1v, - *input_js2h, - *input_js2v, - *input_jump, - *input_push, - *input_trick0, - *input_trick1, - *input_trick2, - *input_walk, - *input_walkh, - *input_walkv, - *input_use, - *input_reset, - *input_grab, - *input_camera; + int immobile; /* * Animation * -------------------------------------------------- */ - struct player_avatar *playeravatar; struct player_model *playermodel; - struct player_board *playerboard; struct player_ragdoll ragdoll; + struct player_board *board; player_pose holdout_pose; float holdout_time;