X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=4688702a68385f01c8d95b68bbc9dffcab278cdf;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=41e03a40b46e836e30d2543279f9753c624a86b6;hpb=df9f72d2912a5424d37dfdb02f76aba8f1ed4df1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index 41e03a4..4688702 100644 --- a/player_skate.c +++ b/player_skate.c @@ -1102,7 +1102,13 @@ static void player__skate_pre_update(void){ v3_copy( localplayer.cam.angles, localplayer.angles ); localplayer.angles[2] = 0.0f; - player__begin_holdout(); + v3f newpos, offset; + m4x3_mulv( localplayer.rb.to_world, (v3f){0.0f,1.0f,0.0f}, newpos ); + v3_add( newpos, (v3f){0.0f,-1.0f,0.0f}, newpos ); + v3_sub( localplayer.rb.co, newpos, offset ); + v3_copy( newpos, localplayer.rb.co ); + + player__begin_holdout( offset ); player__skate_kill_audio(); player__walk_transition(); return; @@ -2676,7 +2682,9 @@ static void player__skate_animate(void){ (1.0f-fabsf(animator->slide)*0.9f); animator->offset[1]=vg_clampf(animator->offset[1],-0.5f,0.0f); - v3_muls( animator->offset, 0.3f, localplayer.cam_control.tpv_offset_extra ); + v3f cam_offset; + v3_mul( animator->offset, (v3f){1.0f,0.3f,1.0f}, cam_offset ); + v3_copy( cam_offset, localplayer.cam_control.tpv_offset_extra ); /* localized vectors */ m4x3_mulv( localplayer.rb.to_local, state->cog, animator->local_cog );