From c4469d9185b199585e7b0c70526b066ba3ab4205 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 15 May 2019 18:21:32 +0200
Subject: [PATCH] selecting a (horo)cyclic/equidistant-based land in the
 Experiments in Geometry while in standard geometry works now

---
 bigstuff.cpp | 2 +-
 landlock.cpp | 2 +-
 system.cpp   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bigstuff.cpp b/bigstuff.cpp
index 583bfcca..93ff7e24 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -1110,7 +1110,7 @@ void set_euland3(cell *c, int co10, int co11, int alt, int hash) {
 
 bool quickfind(eLand l) {
   if(l == cheatdest) return true;
-  if(l == specialland && (weirdhyperbolic || specialland != laIce)) return true;
+  if(l == specialland && (weirdhyperbolic || specialland != laIce || cheater)) return true;
 #if CAP_TOUR
   if(tour::on && tour::quickfind(l)) return true;
 #endif
diff --git a/landlock.cpp b/landlock.cpp
index b72ce68e..9972f2b3 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -305,7 +305,7 @@ eLand getNewLand(eLand old) {
   #endif
 
   if(tactic::on && !(tactic::trailer && old == specialland)) return specialland;
-  if(weirdhyperbolic && specialland != old && specialland != laCrossroads4 && !chaosmode && old != laBarrier) return specialland;
+  if((weirdhyperbolic || cheater) && specialland != old && specialland != laCrossroads4 && specialland != laIce && !chaosmode && old != laBarrier) return specialland;
 
   if(yendor::on && (yendor::clev().flags & YF_WALLS)) {
     if(old != yendor::clev().l) return yendor::clev().l;
diff --git a/system.cpp b/system.cpp
index 5830339e..f0cf9602 100644
--- a/system.cpp
+++ b/system.cpp
@@ -150,6 +150,10 @@ void initgame() {
   
   setdist(cwt.at, BARLEV, NULL);
 
+  if(!use_special_land) {
+    if(firstland != (princess::challenge ? laPalace : laIce)) cheater++;
+    }
+
   if((tactic::on || yendor::on || peace::on) && isCyclic(firstland)) {
     anthraxBonus = items[itHolyGrail];
     cwt.at->move(0)->land = firstland;