From 3e7a60440875060b418a0e628c99cddeae2623e0 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 25 Aug 2019 19:50:14 +0200
Subject: [PATCH] fixup to know actual_geometry

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

diff --git a/landlock.cpp b/landlock.cpp
index c9adea8c..72568aaa 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -685,7 +685,7 @@ EX land_validity_t& land_validity(eLand l) {
       return lv::not_implemented;
     if(among(l, laReptile, laDragon, laTortoise))
       return lv::bad_graphics;
-    if((actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
+    if((hybrid::actual_geometry == gSL2 || geometry == gSL2) && l == laDryForest)
       return lv::hedgehogs;
     if(hybri) return *PIU(&land_validity(l));
     }
diff --git a/nonisotropic.cpp b/nonisotropic.cpp
index 2cdedea2..fb31f3aa 100644
--- a/nonisotropic.cpp
+++ b/nonisotropic.cpp
@@ -584,7 +584,7 @@ EX namespace hybrid {
 
   hrmap *pmap;
   geometry_information *pcgip;
-  geometry actual_geometry;
+  eGeometry actual_geometry;
   
   template<class T> auto in_actual(const T& t) -> decltype(t()) {
     dynamicval<eGeometry> g(geometry, actual_geometry);
@@ -606,7 +606,7 @@ EX namespace hybrid {
     template<class T> auto in_underlying(const T& t) -> decltype(t()) {
       pcgip = cgip; 
       dynamicval<hrmap*> gpm(pmap, this);
-      dynamicval<hrmap*> gag(actual_geometry, geometry);
+      dynamicval<eGeometry> gag(actual_geometry, geometry);
       dynamicval<eGeometry> g(geometry, underlying);
       dynamicval<geometry_information*> gc(cgip, underlying_cgip);
       dynamicval<hrmap*> gu(currentmap, underlying_map);