From e9920d8d5731535a9714a28a19e9c69f756defec Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Tue, 27 Nov 2018 19:44:15 +0100
Subject: [PATCH] Chaos mode not works in Euclidean

---
 bigstuff.cpp | 7 ++++++-
 system.cpp   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bigstuff.cpp b/bigstuff.cpp
index 93c1c4a0..7384c34d 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -761,7 +761,12 @@ void clear_euland(eLand first) {
   }
 
 eLand switchable(eLand nearland, eLand farland, int c) {
-  if(specialland == laCrossroads4) {
+  if(chaosmode) {
+    if(hrand(6) == 0)
+      return getNewLand(nearland);
+    return nearland;
+    }
+  else if(specialland == laCrossroads4) {
     if(hrand(15) == 0)
       return getNewLand(nearland);
     return nearland;
diff --git a/system.cpp b/system.cpp
index bbbe03a7..8546a62a 100644
--- a/system.cpp
+++ b/system.cpp
@@ -1180,7 +1180,7 @@ void switch_game_mode(char switchWhat) {
       break;
 
     case rg::chaos:
-      if(euclid || sphere || quotient)
+      if(sphere || quotient || fulltorus || (euwrap && torusconfig::sdy))
         geometry = gNormal;
       if(tactic::on) firstland = laIce;
       yendor::on = tactic::on = princess::challenge = false;