moved some stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / player_physics.h

diff --git a/player_physics.h b/player_physics.h
index b93ac0394b32aa8211cc0f7490b2134fa5cbd5c7..d5b112be60d51242f64a21e5d1c7f71eedd136fa 100644 (file)
--- a/player_physics.h
+++ b/player_physics.h
@@ -465,7 +465,9 @@ static void player_physics(void)
          player_start_air();
       }
       else
+      {
          phys->in_air = 0;
+      }
    }
 
    for( int j=0; j<5; j++ )
@@ -595,7 +597,7 @@ static void player_physics(void)
          audio_player_set_flags( &audio_player_extra, AUDIO_FLAG_SPACIAL_3D );
          audio_player_set_position( &audio_player_extra, phys->rb.co );
          audio_player_set_vol( &audio_player_extra, 20.0f );
-         audio_player_playclip( &audio_player_extra, &audio_jumps[rand()%4] );
+         audio_player_playclip( &audio_player_extra, &audio_jumps[rand()%2] );
          audio_unlock();
       }
    }
@@ -682,9 +684,9 @@ static void player_do_motion(void)
    /* 
     * Gate intersection, by tracing a line over the gate planes 
     */
-   for( int i=0; i<world.routes.gate_count; i++ )
+   for( int i=0; i<world_routes.gate_count; i++ )
    {
-      struct route_gate *rg = &world.routes.gates[i];
+      struct route_gate *rg = &world_routes.gates[i];
       teleport_gate *gate = &rg->gate;
 
       if( gate_intersect( gate, phys->rb.co, prevco ) )
@@ -713,6 +715,7 @@ static void player_do_motion(void)
          }
          
          player.rewind_length = 0;
+         player.rewind_total_length = 0.0f;
          player.rewind_incrementer = 10000;
          player_save_frame();