allow reset on death

[carveJwlIkooP6JGAAIwe30JlM.git] / player_physics.h

diff --git a/player_physics.h b/player_physics.h
index 997b69d1b657fa696eec2ab8fac0d0c286b43ad5..db7105d1ed246bbfe95947a7612243dee5ca7541 100644 (file)
--- a/player_physics.h
+++ b/player_physics.h
@@ -197,6 +197,9 @@ VG_STATIC void player_physics_control_passive(void)
       v2_muladds( phys->grab_mouse_delta, vg.mouse_delta, 0.02f, 
                   phys->grab_mouse_delta );
       v2_normalize_clamp( phys->grab_mouse_delta );
+
+      if( freecam )
+         v2_zero( phys->grab_mouse_delta );
    }
    else
       v2_zero( phys->grab_mouse_delta );
@@ -502,6 +505,9 @@ VG_STATIC void player_walk_physics(void)
 
    v2f walk = { player.input_walkh->axis.value,
                 player.input_walkv->axis.value };
+
+   if( freecam )
+      v2_zero( walk );
    
    if( v2_length2(walk) > 0.001f )
       v2_normalize_clamp( walk );
@@ -1158,7 +1164,7 @@ VG_STATIC void player_freecam(void)
 {
    player_mouseview();
 
-   float movespeed = fc_speed;
+   float movespeed = fc_speed * VG_TIMESTEP_FIXED;
    v3f lookdir = { 0.0f, 0.0f, -1.0f },
        sidedir = { 1.0f, 0.0f,  0.0f };
    
@@ -1167,17 +1173,11 @@ VG_STATIC void player_freecam(void)
    
    static v3f move_vel = { 0.0f, 0.0f, 0.0f };
 
-   /* TODO */
-#if 0
-   if( vg_get_button( "forward" ) )
-      v3_muladds( move_vel, lookdir, VG_TIMESTEP_FIXED * movespeed, move_vel );
-   if( vg_get_button( "back" ) )
-      v3_muladds( move_vel, lookdir, VG_TIMESTEP_FIXED *-movespeed, move_vel );
-   if( vg_get_button( "left" ) )
-      v3_muladds( move_vel, sidedir, VG_TIMESTEP_FIXED *-movespeed, move_vel );
-   if( vg_get_button( "right" ) )
-      v3_muladds( move_vel, sidedir, VG_TIMESTEP_FIXED * movespeed, move_vel );
-#endif
+   v2f steer = { player.input_js1h->axis.value,
+                 player.input_js1v->axis.value };
+
+   v3_muladds( move_vel, sidedir,  movespeed*steer[0], move_vel );
+   v3_muladds( move_vel, lookdir, -movespeed*steer[1], move_vel );
 
    v3_muls( move_vel, 0.7f, move_vel );
    v3_add( move_vel, player.camera_pos, player.camera_pos );