X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_ragdoll.c;h=d5029dd72865edc08759f826d370587e6a10ac32;hb=eb28dee29482c7ffe8bc0203d302e3ee6dbfd943;hp=d36bec4974ceaedd237c96861fa719f84c7ffc2b;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_ragdoll.c b/player_ragdoll.c
index d36bec4..d5029dd 100644
--- a/player_ragdoll.c
+++ b/player_ragdoll.c
@@ -204,7 +204,8 @@ static void copy_ragdoll_pose_to_avatar( struct player_ragdoll *rd,
       q_m3x3( q_int, mtx );
       v3_copy( co_int, mtx[3] );
 
-      m4x3_mul( mtx, part->inv_collider_mtx, av->sk.final_mtx[part->bone_id] );
+      m4x3_mul( mtx, part->inv_collider_mtx, 
+                localplayer.final_mtx[part->bone_id] );
    }
 
    for( u32 i=1; i<av->sk.bone_count; i++ ){
@@ -219,11 +220,12 @@ static void copy_ragdoll_pose_to_avatar( struct player_ragdoll *rd,
          v3_copy( delta, posemtx[3] );
 
          /* final matrix */
-         m4x3_mul( av->sk.final_mtx[sb->parent], posemtx, av->sk.final_mtx[i] );
+         m4x3_mul( localplayer.final_mtx[sb->parent], posemtx, 
+                   localplayer.final_mtx[i] );
       }
    }
 
-   skeleton_apply_inverses( &av->sk );
+   skeleton_apply_inverses( &av->sk, localplayer.final_mtx );
 }
 
 /*
@@ -239,12 +241,12 @@ static void copy_avatar_pose_to_ragdoll( struct player_avatar *av,
       v3f pos, offset;
       u32 bone = part->bone_id;
 
-      m4x3_mulv( av->sk.final_mtx[bone], av->sk.bones[bone].co, pos );
-      m3x3_mulv( av->sk.final_mtx[bone], part->collider_mtx[3], offset );
+      m4x3_mulv( localplayer.final_mtx[bone], av->sk.bones[bone].co, pos );
+      m3x3_mulv( localplayer.final_mtx[bone], part->collider_mtx[3], offset );
       v3_add( pos, offset, part->obj.rb.co );
 
       m3x3f r;
-      m3x3_mul( av->sk.final_mtx[bone], part->collider_mtx, r );
+      m3x3_mul( localplayer.final_mtx[bone], part->collider_mtx, r );
       m3x3_q( r, part->obj.rb.q );
 
       v3_copy( velocity, part->obj.rb.v );
@@ -267,8 +269,7 @@ static void player_debug_ragdoll(void)
 /*
  * Ragdoll physics step
  */
-static void player_ragdoll_iter( struct player_ragdoll *rd )
-{
+static void player_ragdoll_iter( struct player_ragdoll *rd ){
    world_instance *world = world_current_instance();
 
    int run_sim = 0;