X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_dead.c;h=625ff0e7643cae2dfb8c0d4c5a4cb9dc93cd1789;hb=171b279a489f1b906265759b33249f61d48d3d5f;hp=7733c327e2b0668d9a6a7439fd7fda829cdf509b;hpb=f0ba02684dbf4722afa2dcfd491d56921162182a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_dead.c b/player_dead.c index 7733c32..625ff0e 100644 --- a/player_dead.c +++ b/player_dead.c @@ -15,11 +15,11 @@ static void player__dead_post_update(void){ v3f ext_co; v4f ext_q; - rb_extrapolate( &part->obj.rb, ext_co, ext_q ); + rb_extrapolate( &part->rb, ext_co, ext_q ); v3_lerp( d->co_lpf, ext_co, vg.time_frame_delta*4.0f, d->co_lpf ); - v3_lerp( d->v_lpf, part->obj.rb.v, vg.time_frame_delta*4.0f, d->v_lpf ); - v3_lerp( d->w_lpf, part->obj.rb.w, vg.time_frame_delta*4.0f, d->w_lpf ); + v3_lerp( d->v_lpf, part->rb.v, vg.time_frame_delta*4.0f, d->v_lpf ); + v3_lerp( d->w_lpf, part->rb.w, vg.time_frame_delta*4.0f, d->w_lpf ); v3_copy( d->co_lpf, localplayer.rb.co ); v3_zero( localplayer.rb.v ); @@ -66,9 +66,9 @@ static void player__dead_animate(void){ v3f co_int; float substep = vg.time_fixed_extrapolate; - v3_lerp( part->prev_co, part->obj.rb.co, substep, co_int ); - q_nlerp( part->prev_q, part->obj.rb.q, substep, q_int ); - v4_copy( part->obj.rb.q, q_int ); + v3_lerp( part->prev_co, part->rb.co, substep, co_int ); + q_nlerp( part->prev_q, part->rb.q, substep, q_int ); + v4_copy( part->rb.q, q_int ); q_m3x3( q_int, mtx ); v3_copy( co_int, mtx[3] ); @@ -144,9 +144,9 @@ static void player__dead_transition( enum player_die_type type ){ struct ragdoll_part *part = &localplayer.ragdoll.parts[ localplayer.id_hip-1 ]; - v3_copy( part->obj.rb.co, player_dead.co_lpf ); - v3_copy( part->obj.rb.v, player_dead.v_lpf ); - v3_copy( part->obj.rb.w, player_dead.w_lpf ); + v3_copy( part->rb.co, player_dead.co_lpf ); + v3_copy( part->rb.v, player_dead.v_lpf ); + v3_copy( part->rb.w, player_dead.w_lpf ); gui_helper_clear(); vg_str str;