Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make debug binds harder to hit

This commit is contained in:
MysterD 2022-03-07 22:36:27 -08:00
parent 5fa3e27aa6
commit 379b51e384
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pc/controller/controller_keyboard.c
View File

@ -55,6 +55,9 @@ bool keyboard_on_key_down(int scancode) {
} }
bool keyboard_on_key_up(int scancode) { bool keyboard_on_key_up(int scancode) {
#ifdef DEBUG
debug_keyboard_on_key_up(scancode);
#endif
djui_interactable_on_key_up(scancode); djui_interactable_on_key_up(scancode);
int mapped = keyboard_map_scancode(scancode); int mapped = keyboard_map_scancode(scancode);

21
src/pc/controller/controller_keyboard_debug.c
View File

@ -14,6 +14,8 @@
#ifdef DEBUG #ifdef DEBUG
#include "pc/lua/smlua.h" #include "pc/lua/smlua.h"
static bool sHoldingAlt = false;
static u8 warpToLevel = LEVEL_BOB; static u8 warpToLevel = LEVEL_BOB;
static u8 warpToArea = 27; static u8 warpToArea = 27;
// warpToArea: 26 = basement // warpToArea: 26 = basement
@ -31,6 +33,7 @@ static u8 warpToArea = 27;
#define SCANCODE_8 0x09 #define SCANCODE_8 0x09
#define SCANCODE_9 0x0A #define SCANCODE_9 0x0A
#define SCANCODE_F5 0x3f #define SCANCODE_F5 0x3f
#define SCANCODE_ALT 0x38
static void debug_breakpoint_here(void) { static void debug_breakpoint_here(void) {
// create easy breakpoint position for debugging // create easy breakpoint position for debugging
@ -151,18 +154,24 @@ static void debug_spawn_object(void) {
} }
void debug_keyboard_on_key_down(int scancode) { void debug_keyboard_on_key_down(int scancode) {
scancode = scancode;
switch (scancode & 0xFF) { switch (scancode & 0xFF) {
case SCANCODE_ALT: sHoldingAlt = true; break;
case SCANCODE_3: debug_breakpoint_here(); break; case SCANCODE_3: debug_breakpoint_here(); break;
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
case SCANCODE_6: debug_warp_level(warpToLevel); break; case SCANCODE_6: if (sHoldingAlt) { debug_warp_level(warpToLevel); } break;
case SCANCODE_7: debug_warp_area(); break; case SCANCODE_7: if (sHoldingAlt) { debug_warp_area(); } break;
case SCANCODE_8: debug_spawn_object(); break; case SCANCODE_8: if (sHoldingAlt) { debug_spawn_object(); } break;
case SCANCODE_9: debug_warp_to(); break; case SCANCODE_9: if (sHoldingAlt) { debug_warp_to(); } break;
case SCANCODE_0: debug_suicide(); break; case SCANCODE_0: if (sHoldingAlt) { debug_suicide(); } break;
case SCANCODE_F5: debug_reload_lua(); break; case SCANCODE_F5: debug_reload_lua(); break;
#endif #endif
} }
} }
void debug_keyboard_on_key_up(int scancode) {
switch (scancode & 0xFF) {
case SCANCODE_ALT: sHoldingAlt = false; break;
}
}
#endif #endif

1
src/pc/controller/controller_keyboard_debug.h
View File

@ -3,6 +3,7 @@
#ifdef DEBUG #ifdef DEBUG
void debug_keyboard_on_key_down(int scancode); void debug_keyboard_on_key_down(int scancode);
void debug_keyboard_on_key_up(int scancode);
#endif #endif
#endif #endif