Eliminados inputs en desuso y añadido el input de "service"
This commit is contained in:
@@ -15,16 +15,11 @@ device contiene el tipo de dispositivo a comprobar:
|
|||||||
|
|
||||||
enum inputs_e
|
enum inputs_e
|
||||||
{
|
{
|
||||||
// Inputs obligatorios
|
// Inputs de movimiento
|
||||||
input_null,
|
|
||||||
input_up,
|
input_up,
|
||||||
input_down,
|
input_down,
|
||||||
input_left,
|
input_left,
|
||||||
input_right,
|
input_right,
|
||||||
input_pause,
|
|
||||||
input_exit,
|
|
||||||
input_accept,
|
|
||||||
input_cancel,
|
|
||||||
|
|
||||||
// Inputs personalizados
|
// Inputs personalizados
|
||||||
input_fire_left,
|
input_fire_left,
|
||||||
@@ -32,7 +27,10 @@ enum inputs_e
|
|||||||
input_fire_right,
|
input_fire_right,
|
||||||
input_start,
|
input_start,
|
||||||
|
|
||||||
// Inputs estandar
|
// Inputs de control
|
||||||
|
input_exit,
|
||||||
|
input_pause,
|
||||||
|
input_service,
|
||||||
input_window_fullscreen,
|
input_window_fullscreen,
|
||||||
input_window_inc_size,
|
input_window_inc_size,
|
||||||
input_window_dec_size,
|
input_window_dec_size,
|
||||||
@@ -42,6 +40,7 @@ enum inputs_e
|
|||||||
input_showfps,
|
input_showfps,
|
||||||
|
|
||||||
// Input obligatorio
|
// Input obligatorio
|
||||||
|
input_null,
|
||||||
input_number_of_inputs
|
input_number_of_inputs
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -120,16 +120,16 @@ void Director::initInput()
|
|||||||
input->bindKey(input_down, SDL_SCANCODE_DOWN);
|
input->bindKey(input_down, SDL_SCANCODE_DOWN);
|
||||||
input->bindKey(input_left, SDL_SCANCODE_LEFT);
|
input->bindKey(input_left, SDL_SCANCODE_LEFT);
|
||||||
input->bindKey(input_right, SDL_SCANCODE_RIGHT);
|
input->bindKey(input_right, SDL_SCANCODE_RIGHT);
|
||||||
|
|
||||||
input->bindKey(input_fire_left, SDL_SCANCODE_Q);
|
input->bindKey(input_fire_left, SDL_SCANCODE_Q);
|
||||||
input->bindKey(input_fire_center, SDL_SCANCODE_W);
|
input->bindKey(input_fire_center, SDL_SCANCODE_W);
|
||||||
input->bindKey(input_fire_right, SDL_SCANCODE_E);
|
input->bindKey(input_fire_right, SDL_SCANCODE_E);
|
||||||
|
|
||||||
input->bindKey(input_start, SDL_SCANCODE_RETURN);
|
input->bindKey(input_start, SDL_SCANCODE_RETURN);
|
||||||
|
|
||||||
// Teclado - Otros
|
// Teclado - Otros
|
||||||
input->bindKey(input_accept, SDL_SCANCODE_RETURN);
|
|
||||||
input->bindKey(input_cancel, SDL_SCANCODE_ESCAPE);
|
|
||||||
input->bindKey(input_pause, SDL_SCANCODE_P);
|
|
||||||
input->bindKey(input_exit, SDL_SCANCODE_ESCAPE);
|
input->bindKey(input_exit, SDL_SCANCODE_ESCAPE);
|
||||||
|
input->bindKey(input_pause, SDL_SCANCODE_P);
|
||||||
input->bindKey(input_window_dec_size, SDL_SCANCODE_F1);
|
input->bindKey(input_window_dec_size, SDL_SCANCODE_F1);
|
||||||
input->bindKey(input_window_inc_size, SDL_SCANCODE_F2);
|
input->bindKey(input_window_inc_size, SDL_SCANCODE_F2);
|
||||||
input->bindKey(input_window_fullscreen, SDL_SCANCODE_F3);
|
input->bindKey(input_window_fullscreen, SDL_SCANCODE_F3);
|
||||||
@@ -146,16 +146,15 @@ void Director::initInput()
|
|||||||
input->bindGameControllerButton(i, input_down, SDL_CONTROLLER_BUTTON_DPAD_DOWN);
|
input->bindGameControllerButton(i, input_down, SDL_CONTROLLER_BUTTON_DPAD_DOWN);
|
||||||
input->bindGameControllerButton(i, input_left, SDL_CONTROLLER_BUTTON_DPAD_LEFT);
|
input->bindGameControllerButton(i, input_left, SDL_CONTROLLER_BUTTON_DPAD_LEFT);
|
||||||
input->bindGameControllerButton(i, input_right, SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
|
input->bindGameControllerButton(i, input_right, SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
|
||||||
|
|
||||||
input->bindGameControllerButton(i, input_fire_left, SDL_CONTROLLER_BUTTON_X);
|
input->bindGameControllerButton(i, input_fire_left, SDL_CONTROLLER_BUTTON_X);
|
||||||
input->bindGameControllerButton(i, input_fire_center, SDL_CONTROLLER_BUTTON_Y);
|
input->bindGameControllerButton(i, input_fire_center, SDL_CONTROLLER_BUTTON_Y);
|
||||||
input->bindGameControllerButton(i, input_fire_right, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER);
|
input->bindGameControllerButton(i, input_fire_right, SDL_CONTROLLER_BUTTON_B);
|
||||||
|
|
||||||
input->bindGameControllerButton(i, input_start, SDL_CONTROLLER_BUTTON_START);
|
input->bindGameControllerButton(i, input_start, SDL_CONTROLLER_BUTTON_START);
|
||||||
|
|
||||||
// Mando - Otros
|
// Mando - Otros
|
||||||
input->bindGameControllerButton(i, input_accept, SDL_CONTROLLER_BUTTON_START);
|
input->bindGameControllerButton(i, input_service, SDL_CONTROLLER_BUTTON_BACK);
|
||||||
input->bindGameControllerButton(i, input_cancel, SDL_CONTROLLER_BUTTON_A);
|
|
||||||
// input->bindGameControllerButton(i, input_pause, SDL_CONTROLLER_BUTTON_B);
|
|
||||||
input->bindGameControllerButton(i, input_exit, SDL_CONTROLLER_BUTTON_BACK);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mapea las asignaciones a los botones desde el archivo de configuración, si se da el caso
|
// Mapea las asignaciones a los botones desde el archivo de configuración, si se da el caso
|
||||||
|
|||||||
Reference in New Issue
Block a user