projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add one shots to replay buffer
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_skate.c
diff --git
a/player_skate.c
b/player_skate.c
index 4fa21edccde8d7f5ae6f17f324726d781ce8a1e0..779ba7596f5f5126ae102443bdd416d02b4c406c 100644
(file)
--- a/
player_skate.c
+++ b/
player_skate.c
@@
-758,7
+758,6
@@
static void skate_apply_trick_model(void){
if( (v3_length2(state->trick_vel) >= 0.0001f ) &&
state->trick_time > 0.2f)
{
if( (v3_length2(state->trick_vel) >= 0.0001f ) &&
state->trick_time > 0.2f)
{
- player__skate_kill_audio();
player__dead_transition( k_player_die_type_feet );
}
player__dead_transition( k_player_die_type_feet );
}
@@
-1220,7
+1219,6
@@
static void player__skate_pre_update(void){
localplayer.rb.co );
player__begin_holdout( offset );
localplayer.rb.co );
player__begin_holdout( offset );
- player__skate_kill_audio();
player__walk_transition( state->activity <= k_skate_activity_air_to_grind?
0: 1, state->trick_euler[0] );
return;
player__walk_transition( state->activity <= k_skate_activity_air_to_grind?
0: 1, state->trick_euler[0] );
return;
@@
-1278,10
+1276,7
@@
static void player__skate_comp_audio( void *_animator ){
f32 gate = skaterift.time_rate;
if( skaterift.activity == k_skaterift_replay ){
f32 gate = skaterift.time_rate;
if( skaterift.activity == k_skaterift_replay ){
- if( skaterift.replay_control == k_replay_control_play )
- gate = 1.0f;
- else
- gate = vg_minf( 1.0f, fabsf(skaterift.track_velocity) );
+ gate = vg_minf( 1.0f, fabsf(skaterift.track_velocity) );
}
f32
}
f32
@@
-2192,7
+2187,6
@@
static void player__skate_update(void){
player__networked_sfx( k_player_subsystem_walk, 32,
k_player_walk_soundeffect_splash,
localplayer.rb.co, 1.0f );
player__networked_sfx( k_player_subsystem_walk, 32,
k_player_walk_soundeffect_splash,
localplayer.rb.co, 1.0f );
- player__skate_kill_audio();
player__dead_transition( k_player_die_type_generic );
return;
}
player__dead_transition( k_player_die_type_generic );
return;
}
@@
-2468,7
+2462,6
@@
begin_collision:;
v3_lerp( start_co, localplayer.rb.co, t, localplayer.rb.co );
rb_update_transform( &localplayer.rb );
v3_lerp( start_co, localplayer.rb.co, t, localplayer.rb.co );
rb_update_transform( &localplayer.rb );
- player__skate_kill_audio();
player__dead_transition( k_player_die_type_head );
return;
}
player__dead_transition( k_player_die_type_head );
return;
}
@@
-2638,7
+2631,6
@@
begin_collision:;
if( nforce > 17.6f ){
v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v );
player__dead_transition( k_player_die_type_feet );
if( nforce > 17.6f ){
v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v );
player__dead_transition( k_player_die_type_feet );
- player__skate_kill_audio();
return;
}
return;
}