- [NEW] Sempre es pot navegar pels menus amb cursors, RETURN i ESCAPE
- [NEW] El gamepad es configura amb la info del gamescontrollerdb.txt per defecte - [NEW] El botó de START en el gamepad funciona com el ESCAPE del teclat - [FIX] La música ingame continuava estant mal - [FIX] Si la música està desactivada que no sone la del logo
This commit is contained in:
@@ -41,7 +41,7 @@ namespace modules
|
||||
{
|
||||
if (state == STATE_SELECTING)
|
||||
{
|
||||
if (input::keyPressed(SDL_SCANCODE_ESCAPE)) {
|
||||
if (controller::pressed(KEY_MENU)) {
|
||||
return MENU_TECLES_TORNAR;
|
||||
}
|
||||
if (controller::pressed(KEY_DOWN) || input::keyPressed(SDL_SCANCODE_DOWN))
|
||||
@@ -56,7 +56,7 @@ namespace modules
|
||||
selected_option--; if (selected_option<0) selected_option=6;
|
||||
}
|
||||
|
||||
if (controller::pressed(KEY_JUMP) || controller::pressed(KEY_PICK) || input::keyPressed(SDL_SCANCODE_SPACE))
|
||||
if (controller::pressed(KEY_JUMP) || controller::pressed(KEY_PICK) || input::keyPressed(SDL_SCANCODE_RETURN))
|
||||
{
|
||||
audio::playSound("snd_push.wav", SOUND_BASIC);
|
||||
if (selected_option==MENU_TECLES_TORNAR)
|
||||
@@ -68,7 +68,8 @@ namespace modules
|
||||
const uint8_t key = input::getKeyPressed();
|
||||
if (key != SDL_SCANCODE_UNKNOWN) {
|
||||
if (key != SDL_SCANCODE_ESCAPE) config::defineKey(selected_option, key);
|
||||
state = STATE_SELECTING;
|
||||
selected_option++;
|
||||
if (selected_option==6) state = STATE_SELECTING;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user