diff --git a/rogueviz/ads/ads-game.cpp b/rogueviz/ads/ads-game.cpp index 17ee0aca..74e030a2 100644 --- a/rogueviz/ads/ads-game.cpp +++ b/rogueviz/ads/ads-game.cpp @@ -52,13 +52,13 @@ namespace ads_game { /* ADS-specific keys */ void set_default_keys() { - multi::change_default_key(lps_relhell, 'p', 16 + 9); - multi::change_default_key(lps_relhell, 't', 16 + 10); - multi::change_default_key(lps_relhell, 'o', 16 + 11); - multi::change_default_key(lps_relhell, 'm', 16 + 12); - multi::change_default_key(lps_relhell, 'i', 16 + 13); - multi::change_default_key(lps_relhell, 'k', 16 + 14); - multi::change_default_key(lps_relhell, 'l', 16 + 15); + multi::change_default_key(lps_relhell, SDL12('p', SDL_SCANCODE_P), 16 + 9); + multi::change_default_key(lps_relhell, SDL12('t', SDL_SCANCODE_T), 16 + 10); + multi::change_default_key(lps_relhell, SDL12('o', SDL_SCANCODE_O), 16 + 11); + multi::change_default_key(lps_relhell, SDL12('m', SDL_SCANCODE_M), 16 + 12); + multi::change_default_key(lps_relhell, SDL12('i', SDL_SCANCODE_I), 16 + 13); + multi::change_default_key(lps_relhell, SDL12('k', SDL_SCANCODE_K), 16 + 14); + multi::change_default_key(lps_relhell, SDL12('l', SDL_SCANCODE_L), 16 + 15); } void ads_sub_restart() { diff --git a/rogueviz/ads/help.cpp b/rogueviz/ads/help.cpp index 07a2cf82..5135c37d 100644 --- a/rogueviz/ads/help.cpp +++ b/rogueviz/ads/help.cpp @@ -107,7 +107,7 @@ int generate_mouseovers() { if(!paused) { int v = -1; for(int i=0; i= 0) mouseovers = "press " + dialog::keyname(v) + " to pause"; + if(v >= 0) mouseovers = "press " + SDL12(dialog::keyname(v), string(SDL_GetScancodeName(SDL_Scancode(v)))) + " to pause"; return 1; } diff --git a/rogueviz/bringris.cpp b/rogueviz/bringris.cpp index e2b9bcf0..4e285811 100644 --- a/rogueviz/bringris.cpp +++ b/rogueviz/bringris.cpp @@ -2176,11 +2176,11 @@ int args() { } void default_config() { - multi::change_default_key(lps_bringris, '\r', 16 + 8); - multi::change_default_key(lps_bringris, 'q', 16 + 9); - multi::change_default_key(lps_bringris, 'e', 16 + 10); - multi::change_default_key(lps_bringris, ' ', 16 + 11); - multi::change_default_key(lps_bringris, 'p', 16 + 12); + multi::change_default_key(lps_bringris, SDL12('\r', SDL_SCANCODE_RETURN), 16 + 8); + multi::change_default_key(lps_bringris, SDL12('q', SDL_SCANCODE_Q), 16 + 9); + multi::change_default_key(lps_bringris, SDL12('e', SDL_SCANCODE_E), 16 + 10); + multi::change_default_key(lps_bringris, SDL12(' ', SDL_SCANCODE_SPACE), 16 + 11); + multi::change_default_key(lps_bringris, SDL12('p', SDL_SCANCODE_P), 16 + 12); param_i(bgeom, "bringris-geometry", 0); param_b(stars_enabled, "bringris_stars", true); diff --git a/rogueviz/nilrider/nilrider.cpp b/rogueviz/nilrider/nilrider.cpp index a0ba039b..912c6cca 100644 --- a/rogueviz/nilrider/nilrider.cpp +++ b/rogueviz/nilrider/nilrider.cpp @@ -297,11 +297,17 @@ void run() { } int* t = multi::scfg_default.keyaction; - for(int i=1; i<512; i++) { + for(int i=1; i