X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_drive.c;h=216ec8994ce79cdcb2983fd05c10f20fcf20fd7c;hb=ba32ebf50f42c9eb832ed61a110ca91a535b6cd9;hp=1c082121026d50934fc01958a9739e35588c99cf;hpb=01e2535f8daaab0e3d46dcc61a08a9268babd47c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_drive.c b/player_drive.c
index 1c08212..216ec89 100644
--- a/player_drive.c
+++ b/player_drive.c
@@ -2,16 +2,18 @@
 #define PLAYER_DRIVE_C
 
 #include "player.h"
+#include "input.h"
 
 VG_STATIC void player__drive_pre_update( player_instance *player )
 {
    struct player_drive *drive = &player->_drive;
    drivable_vehicle *vehc = drive->vehicle;
 
-   vehc->steer = vg_lerpf( vehc->steer, 
-                           player->input_walkh->axis.value * 0.4f,
-                           k_rb_delta * 8.0f );
-   vehc->drive = player->input_walkv->axis.value;
+   v2f steer;
+   joystick_state( k_srjoystick_steer, steer );
+
+   vehc->steer = vg_lerpf( vehc->steer, steer[0] * 0.4f, k_rb_delta * 8.0f );
+   vehc->drive = steer[1];
 }
 
 VG_STATIC void player__drive_update( player_instance *player )
@@ -39,7 +41,7 @@ VG_STATIC void player__drive_animate( player_instance *player,
 
 VG_STATIC void player__drive_post_animate( player_instance *player )
 {
-   if( player->camera_mode == k_cam_firstperson )
+   if( player->cam_control.camera_mode == k_cam_firstperson )
       player->cam_velocity_influence = 0.0f;
    else
       player->cam_velocity_influence = 1.0f;