From e1ec5dbf03a90763ce24b612d24f7c78e552810f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 2 Aug 2019 17:29:53 +0200 Subject: [PATCH] disabled Camelot in 3D fullgames --- bigstuff.cpp | 2 +- landlock.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bigstuff.cpp b/bigstuff.cpp index dd3297ee..99cd4e3a 100644 --- a/bigstuff.cpp +++ b/bigstuff.cpp @@ -1321,7 +1321,7 @@ void buildBigStuff(cell *c, cell *from) { buildBarrier4(c, bd, 0, getNewLand(c->land), c->land); */ } - if((!chaosmode) && bearsCamelot(c->land) && is_master(c) && !binarytiling && + if((!chaosmode) && bearsCamelot(c->land) && is_master(c) && !binarytiling && !(hyperbolic && WDIM == 3) && (quickfind(laCamelot) || peace::on || (hrand(I2000) < (c->land == laCrossroads4 ? 800 : 200) && horo_ok() && items[itEmerald] >= U5 && !tactic::on && !racing::on))) { int rtr = newRoundTableRadius(); diff --git a/landlock.cpp b/landlock.cpp index bec60632..6fafc074 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -574,6 +574,7 @@ bool isLandIngame(eLand l) { if(isElemental(l)) l = laElementalWall; if(dual::state == 2 && !dual::check_side(l)) return false; if((euclid || sol) && isCyclic(l) && l != specialland) return false; + if(l == laCamelot && hyperbolic && WDIM == 3) return false; return land_validity(l).flags & lv::appears_in_full; }