-#ifndef INPUT_H
-#define INPUT_H
-
-#define VG_GAME
-#include "vg/vg.h"
+#pragma once
#include "vg/vg_platform.h"
#include "vg/vg_console.h"
#include "vg/vg_input.h"
[k_srbind_use] = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ),
[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
[k_srbind_dead_respawn] =
- INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
+ INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_UP ),
[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
[k_srbind_mleft] = INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
[k_srbind_mright]= INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
static int input_filter_generic(void){
if( srinput.state != k_input_state_enabled ||
- vg_ui.wants_mouse || vg_console.enabled )
+ vg_ui.wants_mouse || vg_console.enabled || vg.settings_open )
return 1;
else
return 0;
else srinput.button_states[k_srbind_mdown][0] = 1;
}
}
-
-#endif /* INPUT_H */