projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ahdouaeaiwe
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index b05714e4e893209fe2198628700419d72c600c50..1e667ca777d0b0d95b3c86c95bb24dbee6a0517c 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-162,10
+162,7
@@
static void player_start_air(void)
player.in_air = 1;
float pstep = ktimestep*10.0f;
player.in_air = 1;
float pstep = ktimestep*10.0f;
-
- float best_velocity_mod = 0.0f,
- best_velocity_delta = -9999.9f;
-
+ float best_velocity_delta = -9999.9f;
float k_bias = 0.96f;
v3f axis;
float k_bias = 0.96f;
v3f axis;
@@
-228,7
+225,6
@@
static void player_start_air(void)
if( (land_delta < 0.0f) && (land_delta > best_velocity_delta) )
{
best_velocity_delta = land_delta;
if( (land_delta < 0.0f) && (land_delta > best_velocity_delta) )
{
best_velocity_delta = land_delta;
- best_velocity_mod = vmod;
v3_copy( contact.pos, player.land_target );
v3_copy( contact.pos, player.land_target );
@@
-1016,6
+1012,7
@@
static void player_walkgrid_iter(struct walkgrid *wg, int iter)
pa[0] = wg->region[0][0] + (float)wg->cell_id[0] *k_gridscale;
pa[1] = (wg->region[0][1] + wg->region[1][1]) * 0.5f + k_gridscale;
pa[2] = wg->region[0][2] + (float)wg->cell_id[1] *k_gridscale;
pa[0] = wg->region[0][0] + (float)wg->cell_id[0] *k_gridscale;
pa[1] = (wg->region[0][1] + wg->region[1][1]) * 0.5f + k_gridscale;
pa[2] = wg->region[0][2] + (float)wg->cell_id[1] *k_gridscale;
+#if 0
pb[0] = pa[0];
pb[1] = pa[1];
pb[2] = pa[2] + k_gridscale;
pb[0] = pa[0];
pb[1] = pa[1];
pb[2] = pa[2] + k_gridscale;
@@
-1025,7
+1022,6
@@
static void player_walkgrid_iter(struct walkgrid *wg, int iter)
pd[0] = pa[0] + k_gridscale;
pd[1] = pa[1];
pd[2] = pa[2];
pd[0] = pa[0] + k_gridscale;
pd[1] = pa[1];
pd[2] = pa[2];
-#if 0
/* if you want to draw the current cell */
vg_line( pa, pb, 0xff00ffff );
vg_line( pb, pc, 0xff00ffff );
/* if you want to draw the current cell */
vg_line( pa, pb, 0xff00ffff );
vg_line( pb, pc, 0xff00ffff );
@@
-2005,6
+2001,8
@@
static void player_update(void)
player.mdl.shoes[0] = 1;
player.mdl.shoes[1] = 1;
player.mdl.shoes[0] = 1;
player.mdl.shoes[1] = 1;
+
+ world_routes_notify_reset();
}
if( vg_get_button_down( "switchmode" ) )
}
if( vg_get_button_down( "switchmode" ) )