X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=84ce9e3606e1deb7c937dde3af1022152fad0c41;hb=4fa9aa9a1e09940e91cc30e171e3de0606515ef3;hp=eeed469d04c52c8b7cdbf36d04709a6eaf967ef3;hpb=6ba5c35d106d749a1ebafbd3cbe18c3a02f781d3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_common.c b/player_common.c
index eeed469..84ce9e3 100644
--- a/player_common.c
+++ b/player_common.c
@@ -52,14 +52,13 @@ static void player_camera_portal_correction(void){
          m4x3_invert_affine( localplayer.gate_waiting->transport, inverse );
          m4x3_mulv( inverse, localplayer.cam.pos, localplayer.cam.pos );
 
-         struct skeleton *sk = &localplayer.playeravatar->sk;
-         skeleton_apply_transform( sk, inverse, localplayer.final_mtx );
+         skeleton_apply_transform( &localplayer.skeleton, inverse, 
+                                    localplayer.final_mtx );
       }
    }
 }
 
 static void player__cam_iterate(void){
-   struct player_avatar *av = localplayer.playeravatar;
    struct player_cam_controller *cc = &localplayer.cam_control;
 
    if( localplayer.subsystem == k_player_subsystem_walk ){
@@ -127,7 +126,7 @@ static void player__cam_iterate(void){
 
    /* position */
    v3f fpv_pos, fpv_offset;
-   m4x3_mulv( localplayer.final_mtx[ av->id_head-1 ], 
+   m4x3_mulv( localplayer.final_mtx[ localplayer.id_head-1 ], 
                cc->fpv_viewpoint_smooth, fpv_pos );
    m3x3_mulv( localplayer.rb.to_world, cc->fpv_offset_smooth, fpv_offset );
    v3_add( fpv_offset, fpv_pos, fpv_pos );