X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_ragdoll.c;h=413f9a8d137e73b58466475b7d4713bfd681bc6f;hb=a109f126d8adab622e38fbcc2d4281e75255246a;hp=6dc171d0f28c73944b13254d43fe76f1634cfe9d;hpb=f965094faed4f1828c7a6a6b3ca856bd5f1e5248;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_ragdoll.c b/player_ragdoll.c
index 6dc171d..413f9a8 100644
--- a/player_ragdoll.c
+++ b/player_ragdoll.c
@@ -439,7 +439,8 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
       contact_velocities[i] = vn;
    }
 
-   rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+   rb_presolve_contacts( rb_contact_buffer, vg.time_fixed_delta, 
+                         rb_contact_count );
    rb_presolve_swingtwist_constraints( rd->cone_constraints,
                                        rd->cone_constraints_count );
 
@@ -536,8 +537,6 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
    if( run_sim && 
          (v3_length2(player_dead.v_lpf)>(k_ragdoll_active_threshold*
                                          k_ragdoll_active_threshold)) ){
-      assert( rd->cone_constraints_count == rd->position_constraints_count );
-
       mdl_keyframe anim[32];
       skeleton_sample_anim( &localplayer.skeleton, player_dead.anim_bail,
                             0.0f, anim );
@@ -580,14 +579,14 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
 
          v3f torque;
          v3_muls( axis, F, torque );
-         v3_muladds( st->rbb->w, torque, k_rb_delta, st->rbb->w );
+         v3_muladds( st->rbb->w, torque, vg.time_fixed_delta, st->rbb->w );
 
          /* apply a adjustment to keep velocity at joint 0 */
 #if 0
          v3f wcb, vcb;
          m3x3_mulv( st->rbb->to_world, pc->lcb, wcb );
          v3_cross( torque, wcb, vcb );
-         v3_muladds( st->rbb->v, vcb, k_rb_delta, st->rbb->v );
+         v3_muladds( st->rbb->v, vcb, vg.time_fixed_delta, st->rbb->v );
 #endif
       }
    }