X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=inline;f=player.h;h=0abb22e41963d8da8c5e8e579e93c0417aaba6ef;hb=d8fc0acce1b39466038284aa6f1941ebe98c8348;hp=f426b7daad07462dc915b518c36da249b0ff5fbc;hpb=b3b0d3d852f102147c6306f71818013e51e1687e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index f426b7d..0abb22e 100644 --- a/player.h +++ b/player.h @@ -370,12 +370,17 @@ VG_STATIC void player_save_rewind_frame(void) } } + +/* disaster */ +VG_STATIC int menu_enabled(void); +#include "menu.h" + /* * Free camera movement */ VG_STATIC void player_mouseview(void) { - if( ui_want_mouse() ) + if( menu_enabled() ) return; v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles ); @@ -413,10 +418,6 @@ VG_STATIC void player_mouseview(void) player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); } -/* disaster */ -VG_STATIC int menu_enabled(void); -#include "menu.h" - /* Deal with input etc */ VG_STATIC void player_update_pre(void) {