revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / player_common.c

diff --git a/player_common.c b/player_common.c
index bfdef1ab97b306129acfe9cf3c47b6dbe5321884..2551968e5f76cbea21af133dbca99d4de041ed54 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -1,6 +1,3 @@
-#ifndef PLAYER_COMMON_C
-#define PLAYER_COMMON_C
-
 #include "ent_skateshop.h"
 #include "player.h"
 #include "input.h"
@@ -42,8 +39,9 @@ static void player_camera_portal_correction(void){
                                  localplayer.final_mtx );
 
       /* record and re-put things again */
-      if( cleared ){
-         skaterift_record_frame( &skaterift.replay, 1 );
+      if( cleared )
+      {
+         skaterift_record_frame( &player_replay.local, 1 );
          localplayer.deferred_frame_record = 1;
 
          skeleton_apply_transform( &localplayer.skeleton, 
@@ -164,7 +162,7 @@ static void player__cam_iterate(void){
          inf_tpv = localplayer.cam_velocity_influence_smooth *
                      (1.0f-cc->camera_type_blend);
 
-   camera_lerp_angles( localplayer.angles, velocity_angles, 
+   vg_camera_lerp_angles( localplayer.angles, velocity_angles, 
                         inf_fpv,
                         localplayer.angles );
 
@@ -196,7 +194,7 @@ static void player__cam_iterate(void){
    float ya = atan2f( -cc->cam_velocity_smooth[1], 30.0f );
 
    follow_angles[1] = 0.3f + ya;
-   camera_lerp_angles( localplayer.angles, follow_angles,
+   vg_camera_lerp_angles( localplayer.angles, follow_angles,
                         inf_tpv,
                         localplayer.angles );
 
@@ -250,35 +248,6 @@ static void player__cam_iterate(void){
    v3_add( localplayer.cam_land_punch, localplayer.cam.pos, 
            localplayer.cam.pos );
 
-   if( k_cinema >= 0.0001f ){
-      ent_camera *cam = NULL;
-      f32 min_dist = k_cinema;
-
-      world_instance *world = world_current_instance();
-      for( u32 i=0; i<mdl_arrcount(&world->ent_camera); i++ ){
-         ent_camera *c = mdl_arritm(&world->ent_camera,i);
-
-         f32 dist = v3_dist( c->transform.co, localplayer.rb.co );
-
-         if( dist < min_dist ){
-            min_dist = dist;
-            cam = c;
-         }
-      }
-
-      if( cam ){
-         localplayer.cam.fov = cam->fov;
-         v3_copy( cam->transform.co, localplayer.cam.pos );
-         v3f v0;
-         if( k_cinema_fixed )
-            mdl_transform_vector( &cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 );
-         else 
-            v3_sub( localplayer.rb.co, cam->transform.co, v0 );
-
-         v3_angles( v0, localplayer.cam.angles );
-      }
-   }
-
    /* portal transitions */
    player_camera_portal_correction();
 }
@@ -303,5 +272,3 @@ static void player_look( v3f angles, float speed ){
    angles[1] += input_y * speed;
    angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
 }
-
-#endif /* PLAYER_COMMON_C */