From 59bfb1f7aef3254f5f575e465333c5a1d4ad861e Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 18 Aug 2017 01:40:31 +0200
Subject: [PATCH] reset firstland (and thus don't invoke cheat mode) when going
 from tactic to chaos or inv

---
 system.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/system.cpp b/system.cpp
index cbc74942..3fb99fcf 100644
--- a/system.cpp
+++ b/system.cpp
@@ -827,10 +827,6 @@ void loadsave() {
 #endif
   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;
 
   FILE *f = fopen(scorefile, "rt");
@@ -1052,11 +1048,13 @@ void restartGame(char switchWhat, bool push) {
     }
   if(switchWhat == 'i') {
     inv::on = !inv::on;
+    if(tactic::on) firstland = laIce;
     tactic::on = yendor::on = princess::challenge = 
     randomPatternsMode = peace::on = false;
     }
   if(switchWhat == 'C') {
     geometry = gNormal;
+    if(tactic::on) firstland = laIce;
     yendor::on = tactic::on = princess::challenge = false;
     resetGeometry();
     chaosmode = !chaosmode;