fix

diff --git a/maps_src/mp_gridmap.mdl b/maps_src/mp_gridmap.mdl
index 439054319d5448350e0817b3ed97f4fe347f73e4..926e2ed5943fa06689e9b7de0f76400b084febe5 100644 (file)
Binary files a/maps_src/mp_gridmap.mdl and b/maps_src/mp_gridmap.mdl differ

diff --git a/player_skate.c b/player_skate.c
index f6ecc10d6a0dfe9f955e6c28ff52f9104d2ba3ec..32e792f5ba51c46d9c6cc9b999e8a4821abfdf72 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -1206,9 +1206,6 @@ VG_STATIC void skate_weight_distribute( player_instance *player )
       {
          if( reverse_dir != s->state.manual_direction )
          {
-#if 0
-            player__dead_transition( player );
-#endif
             return;
          }
       }
@@ -1223,7 +1220,6 @@ VG_STATIC void skate_weight_distribute( player_instance *player )
 
    /* TODO: Fall back on land normal */
    /* TODO: Lerp weight distribution */
-   /* TODO: Can start manual only if not charge jump */
    if( s->state.manual_direction )
    {
       v3f plane_z;
@@ -1274,9 +1270,6 @@ VG_STATIC void skate_adjust_up_direction( player_instance *player )
    }
    else
    {
-      /* FIXME UNDEFINED! */
-      vg_warn( "Undefined up target!\n" );
-
       v3_lerp( s->state.up_dir, (v3f){0.0f,1.0f,0.0f},
                12.0f * s->substep_delta, s->state.up_dir );
    }
@@ -1427,8 +1420,13 @@ VG_STATIC void skate_5050_apply( player_instance *player,
    v3_muladds( inf_back->co, inf_avg.dir, 0.5f, inf_avg.co );
    v3_normalize( inf_avg.dir );
 
-   /* FIXME */
-   v3_copy( (v3f){0.0f,1.0f,0.0f}, inf_avg.n );
+   v3f axis_front, axis_back, axis;
+   v3_cross( inf_front->dir, inf_front->n, axis_front );
+   v3_cross( inf_back->dir,  inf_back->n,  axis_back  );
+   v3_add( axis_front, axis_back, axis );
+   v3_normalize( axis );
+
+   v3_cross( axis, inf_avg.dir, inf_avg.n );
    
    skate_grind_decay( player, &inf_avg, 1.0f );
 

diff --git a/skaterift.c b/skaterift.c
index 87fbc7f5cab1c017e2ca3d1b3d00055a1377b895..fa10ecb3e87736da6b1ad1e0f954247b420e2927 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -269,7 +269,7 @@ VG_STATIC void vg_load(void)
 
    /* 'systems' are completely loaded now */
    strcpy( world.world_name, "maps/mp_mtzero.mdl" );
-   //strcpy( world.world_name, "maps/mp_gridmap.mdl" );
+   strcpy( world.world_name, "maps/mp_gridmap.mdl" );
    world_load();
    vg_console_load_autos();
 }