mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-08 04:12:50 +00:00
Code Issues Releases Wiki Activity

adapted the RogueViz games to SDL2

Browse Source
This commit is contained in:
Zeno Rogue 2025-06-25 00:27:50 +02:00
parent 7b008a5c1d
commit 878ee0c275
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rogueviz/ads/ads-game.cpp
View File

@ -52,13 +52,13 @@ namespace ads_game {
/* ADS-specific keys */ /* ADS-specific keys */
void set_default_keys() { void set_default_keys() {
multi::change_default_key(lps_relhell, 'p', 16 + 9); multi::change_default_key(lps_relhell, SDL12('p', SDL_SCANCODE_P), 16 + 9);
multi::change_default_key(lps_relhell, 't', 16 + 10); multi::change_default_key(lps_relhell, SDL12('t', SDL_SCANCODE_T), 16 + 10);
multi::change_default_key(lps_relhell, 'o', 16 + 11); multi::change_default_key(lps_relhell, SDL12('o', SDL_SCANCODE_O), 16 + 11);
multi::change_default_key(lps_relhell, 'm', 16 + 12); multi::change_default_key(lps_relhell, SDL12('m', SDL_SCANCODE_M), 16 + 12);
multi::change_default_key(lps_relhell, 'i', 16 + 13); multi::change_default_key(lps_relhell, SDL12('i', SDL_SCANCODE_I), 16 + 13);
multi::change_default_key(lps_relhell, 'k', 16 + 14); multi::change_default_key(lps_relhell, SDL12('k', SDL_SCANCODE_K), 16 + 14);
multi::change_default_key(lps_relhell, 'l', 16 + 15); multi::change_default_key(lps_relhell, SDL12('l', SDL_SCANCODE_L), 16 + 15);
} }
void ads_sub_restart() { void ads_sub_restart() {

2
rogueviz/ads/help.cpp
View File

@ -107,7 +107,7 @@ int generate_mouseovers() {
if(!paused) { if(!paused) {
int v = -1; int v = -1;
for(int i=0; i<multi::SCANCODES; i++) if(multi::scfg_default.keyaction[i] == 16+pcPause) v = i; for(int i=0; i<multi::SCANCODES; i++) if(multi::scfg_default.keyaction[i] == 16+pcPause) v = i;
if(v >= 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; return 1;
} }

10
rogueviz/bringris.cpp
View File

@ -2176,11 +2176,11 @@ int args() {
} }
void default_config() { void default_config() {
multi::change_default_key(lps_bringris, '\r', 16 + 8); multi::change_default_key(lps_bringris, SDL12('\r', SDL_SCANCODE_RETURN), 16 + 8);
multi::change_default_key(lps_bringris, 'q', 16 + 9); multi::change_default_key(lps_bringris, SDL12('q', SDL_SCANCODE_Q), 16 + 9);
multi::change_default_key(lps_bringris, 'e', 16 + 10); multi::change_default_key(lps_bringris, SDL12('e', SDL_SCANCODE_E), 16 + 10);
multi::change_default_key(lps_bringris, ' ', 16 + 11); multi::change_default_key(lps_bringris, SDL12(' ', SDL_SCANCODE_SPACE), 16 + 11);
multi::change_default_key(lps_bringris, 'p', 16 + 12); multi::change_default_key(lps_bringris, SDL12('p', SDL_SCANCODE_P), 16 + 12);
param_i(bgeom, "bringris-geometry", 0); param_i(bgeom, "bringris-geometry", 0);
param_b(stars_enabled, "bringris_stars", true); param_b(stars_enabled, "bringris_stars", true);

22
rogueviz/nilrider/nilrider.cpp
View File

@ -297,11 +297,17 @@ void run() {
} }
int* t = multi::scfg_default.keyaction; int* t = multi::scfg_default.keyaction;
for(int i=1; i<512; i++) { for(int i=1; i<multi::SCANCODES; i++) {
auto& ka = dialog::key_actions; auto& ka = dialog::key_actions;
if(t[i] == 16+nrPause) ka[i] = ka[PSEUDOKEY_PAUSE]; auto match = [&] (int nr, int pseudokey) {
if(t[i] == 16+nrViewSimulation) ka[i] = ka[PSEUDOKEY_SIM]; if(t[i] == 16+nr) {
if(t[i] == 16+nrMenu) ka[i] = ka[PSEUDOKEY_MENU]; auto key = SDL12(i, SDL_GetKeyFromScancode(SDL_Scancode(i)/*, 0, true*/));
ka[key] = ka[pseudokey];
}
};
match(nrPause, PSEUDOKEY_PAUSE);
match(nrViewSimulation, PSEUDOKEY_SIM);
match(nrMenu, PSEUDOKEY_MENU);
} }
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
@ -726,10 +732,10 @@ void nilrider_keys() {
multi::change_default_key(lps_nilrider, SDLK_LCTRL, 16 + nrFineControl); multi::change_default_key(lps_nilrider, SDLK_LCTRL, 16 + nrFineControl);
#endif #endif
multi::change_default_key(lps_nilrider, 'p', 16 + nrPause); multi::change_default_key(lps_nilrider, SDL12('p', SDL_SCANCODE_P), 16 + nrPause);
multi::change_default_key(lps_nilrider, 'b', 16 + nrReverseTime); multi::change_default_key(lps_nilrider, SDL12('b', SDL_SCANCODE_B), 16 + nrReverseTime);
multi::change_default_key(lps_nilrider, 'r', 16 + nrViewSimulation); multi::change_default_key(lps_nilrider, SDL12('r', SDL_SCANCODE_R), 16 + nrViewSimulation);
multi::change_default_key(lps_nilrider, 'v', 16 + nrMenu); multi::change_default_key(lps_nilrider, SDL12('v', SDL_SCANCODE_V), 16 + nrMenu);
} }
bool nilrider_music(eLand& l) { bool nilrider_music(eLand& l) {