X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=ee597d0271e4ba0c2cc3d65e310d62a6eb6da0ca;hb=a6880a555be0e8bed7aae08c95b95eeb62ade0b4;hp=a2a2ab2d18771da26f56f5fabadd1b03a9aae2d0;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_common.c b/player_common.c
index a2a2ab2..ee597d0 100644
--- a/player_common.c
+++ b/player_common.c
@@ -1,9 +1,11 @@
 #ifndef PLAYER_COMMON_C
 #define PLAYER_COMMON_C
 
+#include "ent_skateshop.h"
 #include "player.h"
 #include "conf.h"
 #include "input.h"
+#include "menu.h"
 
 VG_STATIC float
    k_cam_spring            = 20.0f,
@@ -236,22 +238,40 @@ VG_STATIC void player__cam_iterate( player_instance *player )
 
 VG_STATIC void player_look( player_instance *player, v3f angles )
 {
+   if( vg_ui.wants_mouse ) return;
+
+   float sensitivity = 1.0f-menu.factive;
+
    angles[2] = 0.0f;
 
    v2f mouse_input;
    v2_copy( vg.mouse_delta, mouse_input );
-   if( cl_invert_y )
-      mouse_input[1] *= -1.0f;
-   v2_muladds( angles, mouse_input, 0.0025f, angles );
+   if( cl_invert_y ) mouse_input[1] *= -1.0f;
+   v2_muladds( angles, mouse_input, 0.0025f * sensitivity, angles );
 
-   angles[0] += srinput.joy_look[0] * vg.time_delta * 4.0f;
-   float input_y = srinput.joy_look[1] * vg.time_delta * 4.0f;
-   if( cl_invert_y )
-      input_y *= -1.0f;
+   v2f jlook;
+   joystick_state( k_srjoystick_look, jlook );
 
-   angles[1] += input_y;
+   angles[0] += jlook[0] * vg.time_delta * 4.0f * sensitivity;
+   float input_y = jlook[1] * vg.time_delta * 4.0f;
+   if( cl_invert_y ) input_y *= -1.0f;
 
+   angles[1] += input_y * sensitivity;
    angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
 }
 
+struct player_board *player_get_player_board( struct player_instance *player )
+{
+   struct player_board *board = NULL;
+
+   if( localplayer.board_view_slot ){
+      struct cache_board *cache_view = localplayer.board_view_slot;
+      if( cache_view->state == k_cache_board_state_loaded ){
+         board = &cache_view->board;
+      }
+   }
+
+   return board;
+}
+
 #endif /* PLAYER_COMMON_C */