added a separate option axes3 for highlighting forward, and in different location

This commit is contained in:
Zeno Rogue 2019-06-25 10:30:31 +02:00
parent 5d88c1706a
commit db988058de
4 changed files with 13 additions and 4 deletions

View File

@ -160,6 +160,7 @@ void initConfig() {
addsaver(vid.mobilecompasssize, "mobile compass size", 0); // ISMOBILE || ISPANDORA ? 30 : 0);
addsaver(vid.radarsize, "radarsize size", 120);
addsaver(vid.axes, "movement help", 1);
addsaver(vid.axes3, "movement help3", false);
addsaver(vid.shifttarget, "shift-targetting", 2);
addsaver(vid.steamscore, "scores to Steam", 1);
initcs(vid.cs); addsaver(vid.cs, "single");
@ -1853,6 +1854,10 @@ void configureMouse() {
dialog::addBoolItem_action(XLAT("draw circle around the target"), (vid.drawmousecircle), 'd');
if(GDIM == 3) {
dialog::addBoolItem_action(XLAT("highlight the cell forward"), vid.axes3, 'f');
}
#if ISMOBILE
dialog::addBoolItem(XLAT("targetting ranged Orbs long-click only"), (vid.shifttarget&2), 'i');
#else

View File

@ -6860,7 +6860,7 @@ void drawMarkers() {
}
}
if(GDIM == 3 && !inHighQual && !shmup::on && vid.axes && playermoved) {
if(GDIM == 3 && !inHighQual && !shmup::on && vid.axes3 && playermoved) {
cell *c = forwardcell();
IG(c) queuecircleat(c, .8, getcs().uicolor);
}

View File

@ -248,6 +248,7 @@ struct videopar {
int flashtime;
int wallmode, monmode, axes;
bool axes3;
bool revcontrol;
int msgleft, msglimit;

View File

@ -395,9 +395,12 @@ struct shmup_configurer {
if(players > 4)
dialog::addItem(XLAT("configure player 5"), '5');
else if(!shmup::on && !multi::alwaysuse) {
const char *axmodes[5] = {"OFF", "auto", "light", "heavy", "arrows"};
dialog::addSelItem(XLAT("help for keyboard users"), XLAT(axmodes[vid.axes]), 'h');
dialog::add_action([] {vid.axes += 60 + (shiftmul > 0 ? 1 : -1); vid.axes %= 5; } );
if(GDIM == 2) {
const char *axmodes[5] = {"OFF", "auto", "light", "heavy", "arrows"};
dialog::addSelItem(XLAT("help for keyboard users"), XLAT(axmodes[vid.axes]), 'h');
dialog::add_action([] {vid.axes += 60 + (shiftmul > 0 ? 1 : -1); vid.axes %= 5; } );
}
else dialog::addBreak(100);
}
else if(alwaysuse)
dialog::addInfo(XLAT("multiplayer and shmup mode; some features"));