From 831d6992707b7908767a7bf03686e01bb24b7b9d Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 23 Apr 2021 20:23:49 +0200
Subject: [PATCH] fixed crashes with Canvas

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

diff --git a/bigstuff.cpp b/bigstuff.cpp
index fb758f7e..f177b204 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -1365,7 +1365,6 @@ EX int wallchance(cell *c, bool deepOcean) {
     l == laCaribbean ? 500 :
     (l == laWarpSea || l == laWarpCoast) ? 500 :
     l == laStorms ? 250 :
-    l == laCanvas ? 0 :
     l == laHaunted ? 0 :
     (l == laGraveyard && !deepOcean) ? 0 :
     // (l == laGraveyard && items[itBone] >= 10) ? 120 :
@@ -1637,7 +1636,7 @@ EX void build_horocycles(cell *c, cell *from) {
     if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt)
       createAlternateMap(c, horo_gen_distance(), hsA);
 
-    if(c->land == laCanvas && horo_ok() && ctof(c) && !c->master->alt)
+    if(c->land == laCanvas && horo_ok() && ctof(c) && !c->master->alt && ls::any_order())
       createAlternateMap(c, horo_gen_distance(), hsA);
 
     if(c->land == laPalace && ctof(c) && !princess::generating && !shmup::on && multi::players == 1 && horo_ok() && !weirdhyperbolic &&
@@ -1814,7 +1813,7 @@ EX void moreBigStuff(cell *c) {
     if(d <= PRADIUS1) currentmap->generateAlts(c->master);
     }
 
-  if(c->land == laCanvas && !eubinary && c->master->alt && !quotient) 
+  if(c->land == laCanvas && !eubinary && c->master->alt && !quotient && (ls::single() || celldistAlt(c) <= 0))
     currentmap->generateAlts(c->master);
 
   if(c->land == laStorms)
diff --git a/system.cpp b/system.cpp
index 28847d0a..59292231 100644
--- a/system.cpp
+++ b/system.cpp
@@ -211,7 +211,7 @@ EX void initgame() {
   pregen();  
   setdist(cwt.at, BARLEV, NULL);
 
-  if(isCyclic(specialland)) {
+  if(isCyclic(specialland) || specialland == laCanvas) {
     #if CAP_COMPLEX2
     camelot::anthraxBonus = items[itHolyGrail];
     #endif