upgrade to vg_msgv2

[carveJwlIkooP6JGAAIwe30JlM.git] / player_common.c

diff --git a/player_common.c b/player_common.c
index b55187588a65b2c1a8c0afeb12dd544bf7450602..169cbf4ba5f7640b0708f7c7966e1a0bba0c5a12 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -119,8 +119,8 @@ VG_STATIC void player__cam_iterate( player_instance *player )
          vg.time_frame_delta * 8.0f, player->tpv_offset_smooth );
 
    /* fov -- simple blend */
-   float fov_skate = vg_lerpf( 97.0f, 135.0f, cl_fov ),
-         fov_walk  = vg_lerpf( 90.0f, 110.0f, cl_fov );
+   float fov_skate = vg_lerpf( 97.0f, 135.0f, k_fov ),
+         fov_walk  = vg_lerpf( 90.0f, 110.0f, k_fov );
 
    player->cam.fov = vg_lerpf( fov_walk, fov_skate, player->camera_type_blend );
 
@@ -241,9 +241,9 @@ VG_STATIC void player__cam_iterate( player_instance *player )
                                player->cam_override_strength );
 
 
-   if( cl_cinema >= 0.0001f ){
+   if( k_cinema >= 0.0001f ){
       ent_camera *cam = NULL;
-      f32 min_dist = cl_cinema;
+      f32 min_dist = k_cinema;
 
       world_instance *world = player->viewable_world;
       for( u32 i=0; i<mdl_arrcount(&world->ent_camera); i++ ){
@@ -261,7 +261,7 @@ VG_STATIC void player__cam_iterate( player_instance *player )
          player->cam.fov = cam->fov;
          v3_copy( cam->transform.co, player->cam.pos );
          v3f v0;
-         if( cl_cinema_fixed )
+         if( k_cinema_fixed )
             mdl_transform_vector( &cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 );
          else v3_sub( player->rb.co, cam->transform.co, v0 );
          m3x3_mulv( player->invbasis, v0, v0 );
@@ -283,7 +283,7 @@ VG_STATIC void player_look( player_instance *player, v3f angles )
 
    v2f mouse_input;
    v2_copy( vg.mouse_delta, mouse_input );
-   if( cl_invert_y ) mouse_input[1] *= -1.0f;
+   if( k_invert_y ) mouse_input[1] *= -1.0f;
    v2_muladds( angles, mouse_input, 0.0025f * sensitivity, angles );
 
    v2f jlook;
@@ -291,7 +291,7 @@ VG_STATIC void player_look( player_instance *player, v3f angles )
 
    angles[0] += jlook[0] * vg.time_delta * 4.0f * sensitivity;
    float input_y = jlook[1] * vg.time_delta * 4.0f;
-   if( cl_invert_y ) input_y *= -1.0f;
+   if( k_invert_y ) input_y *= -1.0f;
 
    angles[1] += input_y * sensitivity;
    angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );