From b90e393ac69fa74c700df4b362be9e39dcf054be Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sun, 26 Apr 2009 05:49:17 +0000 Subject: [PATCH] Rebind F10 to taunt --- CHANGES.WII | 2 +- Src/Display_SDL.h | 13 +++++-------- Src/menutexts.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CHANGES.WII b/CHANGES.WII index dcf6d4f..fb489d2 100644 --- a/CHANGES.WII +++ b/CHANGES.WII @@ -16,7 +16,7 @@ version 10: * Implemented sending text messages over the network to "taunt" the other player (obviously a very important feature). Pressing - ScrLk enables this. + F10 enables this. * Rearranged menus (networking is more promptly displayed) diff --git a/Src/Display_SDL.h b/Src/Display_SDL.h index a1bda1f..4373855 100644 --- a/Src/Display_SDL.h +++ b/Src/Display_SDL.h @@ -581,8 +581,11 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst SAM(TheC64); break; - case SDLK_F10: // F10: Quit - quit_requested = true; + case SDLK_F10: // F10/ScrLk: Enter text (for network taunts) + case SDLK_SCROLLOCK: + this->entering_text_message = !this->entering_text_message; + if (this->entering_text_message) + this->text_message[0] = '\0'; break; case SDLK_F11: // F11: NMI (Restore) @@ -597,12 +600,6 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst TheC64->enter_menu(); break; - case SDLK_SCROLLOCK: - this->entering_text_message = !this->entering_text_message; - if (this->entering_text_message) - this->text_message[0] = '\0'; - break; - case SDLK_KP_PLUS: // '+' on keypad: Increase SkipFrames ThePrefs.SkipFrames++; break; diff --git a/Src/menutexts.c b/Src/menutexts.c index e652267..bab532a 100644 --- a/Src/menutexts.c +++ b/Src/menutexts.c @@ -14,7 +14,7 @@ const char *welcome[] = { /*11*/ "In the networking menu, you can host a game over ", /*12*/ "the network or browse for active games. During ", /*13*/ "network play, you can send messages to your peer ", - /*14*/ "by pressing ScrLk on the USB keyboard. ", + /*14*/ "by pressing F10 on the USB keyboard. ", /*10*/ " ", /*10*/ "In each menu, the '2' button selects and entry ", /*10*/ "and '1' cancels. ",