1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-30 13:32:59 +00:00

reset firstland (and thus don't invoke cheat mode) when going from tactic to chaos or inv

This commit is contained in:
Zeno Rogue
2017-08-18 01:40:31 +02:00
parent 5095826bee
commit 59bfb1f7ae

View File

@@ -827,10 +827,6 @@ void loadsave() {
#endif #endif
DEBB(DF_INIT, (debugfile,"loadSave\n")); DEBB(DF_INIT, (debugfile,"loadSave\n"));
for(int xc=0; xc<MODECODES; xc++)
for(int i=0; i<landtypes; i++) for(int j=0; j<MAXTAC; j++)
tactic::lsc[xc][i][j] = -1;
gamecount = 0; gamecount = 0;
FILE *f = fopen(scorefile, "rt"); FILE *f = fopen(scorefile, "rt");
@@ -1052,11 +1048,13 @@ void restartGame(char switchWhat, bool push) {
} }
if(switchWhat == 'i') { if(switchWhat == 'i') {
inv::on = !inv::on; inv::on = !inv::on;
if(tactic::on) firstland = laIce;
tactic::on = yendor::on = princess::challenge = tactic::on = yendor::on = princess::challenge =
randomPatternsMode = peace::on = false; randomPatternsMode = peace::on = false;
} }
if(switchWhat == 'C') { if(switchWhat == 'C') {
geometry = gNormal; geometry = gNormal;
if(tactic::on) firstland = laIce;
yendor::on = tactic::on = princess::challenge = false; yendor::on = tactic::on = princess::challenge = false;
resetGeometry(); resetGeometry();
chaosmode = !chaosmode; chaosmode = !chaosmode;