mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-03-01 09:20:09 +00:00
Code Issues Releases Wiki Activity

rogueviz::ads:: sharing the general keys

Browse Source
This commit is contained in:
Zeno Rogue 2025-02-08 13:22:56 +01:00
parent dae3bbf3d5
commit 41ac03e347
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,30 +46,16 @@ namespace hr {
namespace ads_game {
void change_default_key(int key, int val) {
int* t = scfg_ads.keyaction;
t[key] = val;
}
/* ADS-specific keys */
void set_default_keys() {
clear_config(scfg_ads);
/* these are shared with the default config */
// change_default_key('s', 16 + 0);
// change_default_key('a', 16 + 1);
// change_default_key('w', 16 + 2);
// change_default_key('d', 16 + 3);
// change_default_key('f', 16 + 4);
/* these are ADS-specific */
change_default_key('p', 16 + 5);
change_default_key('t', 16 + 6);
change_default_key('o', 16 + 7);
change_default_key('m', 16 + 8);
change_default_key('i', 16 + 9);
change_default_key('k', 16 + 10);
change_default_key('l', 16 + 11);
sconfig_savers(scfg_ads, "ads");
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);
}
void restart() {

6
rogueviz/ads/control.cpp
View File

@ -2,8 +2,6 @@ namespace hr {
namespace ads_game {
multi::config scfg_ads;
enum pcmds_extra {
pcPause=9, pcDisplayTimes=10, pcSwitchSpin=11, pcMenu=12,
pcPauseFuture=13, pcPausePast=14, pcPauseMoveSwitch=15
@ -88,7 +86,7 @@ void fire() {
bool handleKey(int sym, int uni) {
if(cmode & sm::NORMAL) {
int* t = scfg_ads.keyaction;
int* t = multi::scfg_default.keyaction;
if(t[sym] >= 16 && t[sym] < 32) return true;
if(sym == 'v') pushScreen(game_menu);
if(sym == SDLK_ESCAPE) pushScreen(game_menu);
@ -149,7 +147,7 @@ ld read_movement() {
}
bool ads_turn(int idelta) {
multi::handleInput(idelta, scfg_ads);
multi::handleInput(idelta, multi::scfg_default);
ld delta = idelta / 1000.;
if(!(cmode & sm::NORMAL)) return false;

2
rogueviz/ads/ds-game.cpp
View File

@ -334,7 +334,7 @@ void ds_fire() {
}
bool ds_turn(int idelta) {
multi::handleInput(idelta, scfg_ads);
multi::handleInput(idelta, multi::scfg_default);
ld delta = idelta / 1000.;
if(!(cmode & sm::NORMAL)) return false;

2
rogueviz/ads/menu.cpp
View File

@ -181,7 +181,7 @@ void game_menu() {
dialog::add_action([] { current.T = Id; vctrV = Id; });
dialog::addItem("configure keys", 'k');
dialog::add_action_push(multi::get_key_configurer(1, move_names, "Relative Hell keys", scfg_ads));
dialog::add_action_push(multi::get_key_configurer(1, move_names, "Relative Hell keys", multi::scfg_default));
#if CAP_AUDIO
add_edit(effvolume);