projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chaos pt 1
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_walk.c
diff --git
a/player_walk.c
b/player_walk.c
index 100e21f60e020b4ceea67f39bdcc2436515faf9d..ebd9dad0cbe37b2ac50e3879006c96e0dff5726d 100644
(file)
--- a/
player_walk.c
+++ b/
player_walk.c
@@
-302,7
+302,7
@@
static void player__walk_pre_update(void){
}
}
else if( button_down( k_srbind_use ) && !localplayer.immobile ){
}
}
else if( button_down( k_srbind_use ) && !localplayer.immobile ){
- if(
v3_dist2( localplayer.rb.co, gzoomer.obj.rb.co ) <= 4.0f*4.0f
){
+ if(
0 && (v3_dist2(localplayer.rb.co,gzoomer.obj.rb.co) <= 4.0f*4.0f)
){
localplayer.subsystem = k_player_subsystem_drive;
}
else{
localplayer.subsystem = k_player_subsystem_drive;
}
else{
@@
-1063,7
+1063,7
@@
static void player__walk_transition(void){
rb_update_transform( &localplayer.rb );
}
rb_update_transform( &localplayer.rb );
}
-static void player__walk_reset(
ent_spawn *rp
){
+static void player__walk_reset(
void
){
struct player_walk *w = &player_walk;
w->state.activity = k_walk_activity_air;
w->state.outro_type = k_walk_outro_none;
struct player_walk *w = &player_walk;
w->state.activity = k_walk_activity_air;
w->state.outro_type = k_walk_outro_none;