From 29bd94d6fca0b084e8f3a6b9ed19d747a21a5eb8 Mon Sep 17 00:00:00 2001 From: pingflood Date: Wed, 22 May 2019 09:24:54 -0300 Subject: Fix button mapping and sound --- hcl/data/midi/allclear.mid.ogg | Bin 0 -> 106894 bytes hcl/data/midi/boss.mid.ogg | Bin 0 -> 1743448 bytes hcl/data/midi/clear.mid.ogg | Bin 0 -> 56760 bytes hcl/data/midi/ending.mid.ogg | Bin 0 -> 468616 bytes hcl/data/midi/gameover.mid.ogg | Bin 0 -> 101272 bytes hcl/data/midi/init.mid.ogg | Bin 0 -> 7711 bytes hcl/data/midi/lastboss.mid.ogg | Bin 0 -> 1946650 bytes hcl/data/midi/main01.mid.ogg | Bin 0 -> 3157303 bytes hcl/data/midi/main02.mid.ogg | Bin 0 -> 2933863 bytes hcl/data/midi/main03.mid.ogg | Bin 0 -> 3239523 bytes hcl/data/midi/main04.mid.ogg | Bin 0 -> 2298544 bytes hcl/data/midi/main05.mid.ogg | Bin 0 -> 1690990 bytes hcl/data/midi/main06.mid.ogg | Bin 0 -> 3386710 bytes hcl/data/midi/nazo.mid.ogg | Bin 0 -> 38778 bytes hcl/data/midi/start.mid.ogg | Bin 0 -> 40773 bytes src/sdl/input.c | 27 ++++++++++++++++++--------- 16 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 hcl/data/midi/allclear.mid.ogg create mode 100644 hcl/data/midi/boss.mid.ogg create mode 100644 hcl/data/midi/clear.mid.ogg create mode 100644 hcl/data/midi/ending.mid.ogg create mode 100644 hcl/data/midi/gameover.mid.ogg create mode 100644 hcl/data/midi/init.mid.ogg create mode 100644 hcl/data/midi/lastboss.mid.ogg create mode 100644 hcl/data/midi/main01.mid.ogg create mode 100644 hcl/data/midi/main02.mid.ogg create mode 100644 hcl/data/midi/main03.mid.ogg create mode 100644 hcl/data/midi/main04.mid.ogg create mode 100644 hcl/data/midi/main05.mid.ogg create mode 100644 hcl/data/midi/main06.mid.ogg create mode 100644 hcl/data/midi/nazo.mid.ogg create mode 100644 hcl/data/midi/start.mid.ogg diff --git a/hcl/data/midi/allclear.mid.ogg b/hcl/data/midi/allclear.mid.ogg new file mode 100644 index 0000000..5965bed Binary files /dev/null and b/hcl/data/midi/allclear.mid.ogg differ diff --git a/hcl/data/midi/boss.mid.ogg b/hcl/data/midi/boss.mid.ogg new file mode 100644 index 0000000..1ae66a5 Binary files /dev/null and b/hcl/data/midi/boss.mid.ogg differ diff --git a/hcl/data/midi/clear.mid.ogg b/hcl/data/midi/clear.mid.ogg new file mode 100644 index 0000000..3654893 Binary files /dev/null and b/hcl/data/midi/clear.mid.ogg differ diff --git a/hcl/data/midi/ending.mid.ogg b/hcl/data/midi/ending.mid.ogg new file mode 100644 index 0000000..dbde529 Binary files /dev/null and b/hcl/data/midi/ending.mid.ogg differ diff --git a/hcl/data/midi/gameover.mid.ogg b/hcl/data/midi/gameover.mid.ogg new file mode 100644 index 0000000..bd66e46 Binary files /dev/null and b/hcl/data/midi/gameover.mid.ogg differ diff --git a/hcl/data/midi/init.mid.ogg b/hcl/data/midi/init.mid.ogg new file mode 100644 index 0000000..6b94f26 Binary files /dev/null and b/hcl/data/midi/init.mid.ogg differ diff --git a/hcl/data/midi/lastboss.mid.ogg b/hcl/data/midi/lastboss.mid.ogg new file mode 100644 index 0000000..d2d72a8 Binary files /dev/null and b/hcl/data/midi/lastboss.mid.ogg differ diff --git a/hcl/data/midi/main01.mid.ogg b/hcl/data/midi/main01.mid.ogg new file mode 100644 index 0000000..32f8ce8 Binary files /dev/null and b/hcl/data/midi/main01.mid.ogg differ diff --git a/hcl/data/midi/main02.mid.ogg b/hcl/data/midi/main02.mid.ogg new file mode 100644 index 0000000..f8cf58a Binary files /dev/null and b/hcl/data/midi/main02.mid.ogg differ diff --git a/hcl/data/midi/main03.mid.ogg b/hcl/data/midi/main03.mid.ogg new file mode 100644 index 0000000..e0001d0 Binary files /dev/null and b/hcl/data/midi/main03.mid.ogg differ diff --git a/hcl/data/midi/main04.mid.ogg b/hcl/data/midi/main04.mid.ogg new file mode 100644 index 0000000..44cd8c7 Binary files /dev/null and b/hcl/data/midi/main04.mid.ogg differ diff --git a/hcl/data/midi/main05.mid.ogg b/hcl/data/midi/main05.mid.ogg new file mode 100644 index 0000000..d650fbe Binary files /dev/null and b/hcl/data/midi/main05.mid.ogg differ diff --git a/hcl/data/midi/main06.mid.ogg b/hcl/data/midi/main06.mid.ogg new file mode 100644 index 0000000..84acdab Binary files /dev/null and b/hcl/data/midi/main06.mid.ogg differ diff --git a/hcl/data/midi/nazo.mid.ogg b/hcl/data/midi/nazo.mid.ogg new file mode 100644 index 0000000..7c8a913 Binary files /dev/null and b/hcl/data/midi/nazo.mid.ogg differ diff --git a/hcl/data/midi/start.mid.ogg b/hcl/data/midi/start.mid.ogg new file mode 100644 index 0000000..38b5d72 Binary files /dev/null and b/hcl/data/midi/start.mid.ogg differ diff --git a/src/sdl/input.c b/src/sdl/input.c index 662b85b..3036987 100644 --- a/src/sdl/input.c +++ b/src/sdl/input.c @@ -42,6 +42,15 @@ void Input_CloseJoystick() joy1 = NULL; } +#define BTN_X SDLK_SPACE +#define BTN_A SDLK_LCTRL +#define BTN_B SDLK_LALT +#define BTN_Y SDLK_LSHIFT +#define BTN_L SDLK_TAB +#define BTN_R SDLK_BACKSPACE +#define BTN_START SDLK_RETURN +#define BTN_SELECT SDLK_ESCAPE + void Input_KeyEvent(SDL_Event* evt) { int w = (evt->type==SDL_KEYDOWN)?1:0; @@ -70,14 +79,14 @@ void Input_KeyEvent(SDL_Event* evt) case SDLK_SPACE: bSelect = w; break; case SDLK_RETURN: bStart = w; break; #elif defined(DINGUX) - case SDLK_LSHIFT: bFaceUp = w; break; - case SDLK_LALT: bFaceDown = w; break; - case SDLK_LCTRL: bFaceLeft = w; break; - case SDLK_SPACE: bFaceRight = w; break; - case SDLK_BACKSPACE: bR = w; break; - case SDLK_TAB: bL = w; break; - case SDLK_ESCAPE: bSelect = w; break; - case SDLK_RETURN: bStart = w; break; + case BTN_X: bFaceUp = w; break; + case BTN_B: bFaceDown = w; break; + case BTN_Y: bFaceLeft = w; break; + case BTN_A: bFaceRight = w; break; + case BTN_R: bR = w; break; + case BTN_L: bL = w; break; + case BTN_START: bSelect = w; break; + case BTN_SELECT: bStart = w; break; #else case SDLK_e: bFaceUp = w; break; case SDLK_x: bFaceDown = w; break; @@ -203,6 +212,6 @@ void PHL_ScanInput() updateKey(&btnFaceDown, bFaceDown|jFaceDown); updateKey(&btnFaceRight, bFaceRight|jFaceRight); - updateKey(&btnAccept, bFaceLeft|jFaceLeft); + updateKey(&btnAccept, bFaceLeft|jFaceLeft|bFaceRight|bFaceRight); updateKey(&btnDecline, bFaceDown|jFaceDown); } -- cgit v1.2.3