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

added a config flag for autojoy in multi

Browse Source
This commit is contained in:
Zeno Rogue
2025-12-12 09:57:15 +01:00
parent ad28935a79
commit 773d0a27cb
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
multi.cpp
View File

@@ -38,6 +38,7 @@ EX namespace multi {
EX bool friendly_fire = true; EX bool friendly_fire = true;
EX bool self_hits; EX bool self_hits;
EX bool two_focus; EX bool two_focus;
EX bool multi_autojoy = true;
EX int players = 1; EX int players = 1;
EX cellwalker player[MAXPLAYER]; EX cellwalker player[MAXPLAYER];
@@ -507,6 +508,8 @@ struct shmup_configurer {
add_edit(joy_init); add_edit(joy_init);
if(haveconfig && !shmup::on) add_edit(multi::multi_autojoy);
dialog::addBreak(50); dialog::addBreak(50);
dialog::addHelp(); dialog::addHelp();
@@ -829,6 +832,8 @@ EX void initConfig() {
param_b(multi::two_focus, "two_focus", false) param_b(multi::two_focus, "two_focus", false)
->editable("auto-adjust dual-focus projections", 'f'); ->editable("auto-adjust dual-focus projections", 'f');
param_b(alwaysuse, "use configured keys"); param_b(alwaysuse, "use configured keys");
param_b(multi::multi_autojoy, "multi_autojoy")
->editable("joystick moves automatically in configured keys", 'j');
for(int i=0; i<7; i++) paramset(multi::scs[i], "player"+its(i)); for(int i=0; i<7; i++) paramset(multi::scs[i], "player"+its(i));
@@ -1094,6 +1099,8 @@ EX void handleInput(int delta, config &scfg) {
if(multi::whereto[i].d == MD_UNDECIDED) alldecided = false; if(multi::whereto[i].d == MD_UNDECIDED) alldecided = false;
if(!multi::multi_autojoy && !accepted[i]) alldecided = false;
if(anypressed) alldecided = false, needinput = false; if(anypressed) alldecided = false, needinput = false;
else multi::mdx[i] = multi::mdy[i] = 0; else multi::mdx[i] = multi::mdy[i] = 0;
} }
@@ -1167,8 +1174,10 @@ EX void handleInput(int delta, config &scfg) {
int scdir = cdir; int scdir = cdir;
bool isUndecided = cdir == MD_UNDECIDED; bool isUndecided = cdir == MD_UNDECIDED;
if(countplayers_undecided > 0 && ! isUndecided) continue; if(countplayers_undecided > 0 && ! isUndecided) continue;
if(playerpos(i) == c) if(playerpos(i) == c) {
multi::whereto[i].d = MD_WAIT; multi::whereto[i].d = MD_WAIT;
multi::accepted[i] = true;
}
else if(!mouseout()) { else if(!mouseout()) {
for(int d=0; d<playerpos(i)->type; d++) { for(int d=0; d<playerpos(i)->type; d++) {
cdir = d; cdir = d;
@@ -1179,6 +1188,7 @@ EX void handleInput(int delta, config &scfg) {
auto& sd = multi::whereto[i].subdir; auto& sd = multi::whereto[i].subdir;
sd = mousedest.subdir; sd = mousedest.subdir;
if(sd == 0) sd = 1; if(sd == 0) sd = 1;
multi::accepted[i] = true;
} }
} }
} }