From 4aa707f1975b6ecae0b8ce7c01880ee8501895d2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 14 Sep 2023 17:37:37 +0200
Subject: [PATCH] renamed horodisk_la* to hv_la*

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

diff --git a/bigstuff.cpp b/bigstuff.cpp
index 74696388..219dc4f8 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -230,8 +230,8 @@ void new_voronoi_root(heptagon *h, int dist, int dir, eLand next, eLand last) {
   altpairs.emplace_back(h, alt);
   altmap::relspin(alt) = dir;
 
-  horodisk_land[alt] = next;
-  horodisk_last_land[alt] = last;
+  hv_land[alt] = next;
+  hv_last_land[alt] = last;
 
   while(alt->distance > -100) {
     auto alt1 = createStep(alt, 0);
@@ -305,8 +305,8 @@ void extend_altmap_voronoi(heptagon *h) {
     ld growth = expansion.get_growth();
     ld odds = pow(growth, ci.candidate->distance) * isize(ci.free_dirs);
     if(hrandf() < odds / (1 + odds)) {
-      eLand last = horodisk_land[ci.candidate->alt];
-      eLand last2 = horodisk_last_land[ci.candidate->alt];
+      eLand last = hv_land[ci.candidate->alt];
+      eLand last2 = hv_last_land[ci.candidate->alt];
       auto dist = ci.candidate->distance;
       // in PURE, could be a tie, or the new root could win
       if(PURE) dist -= hrand(2);
@@ -1811,13 +1811,13 @@ EX void start_camelot(cell *c) {
   if(alt) {
     altmap::radius(alt) = rtr;
     altmap::orig_land(alt) = c->land;
-    horodisk_land[alt] = laCamelot;
+    hv_land[alt] = laCamelot;
     }
   }
 
 EX bool debug_voronoi;
-EX map<heptagon*, eLand> horodisk_land;
-EX map<heptagon*, eLand> horodisk_last_land;
+EX map<heptagon*, eLand> hv_land;
+EX map<heptagon*, eLand> hv_last_land;
 
 EX void build_horocycles(cell *c, cell *from) {
 
@@ -1870,7 +1870,7 @@ EX void build_horocycles(cell *c, cell *from) {
   if(ls::horodisk_structure() && can_start_horo(c)) {
     auto m = create_altmap(c, horo_gen_distance(), hsA);
     if(m) {
-      horodisk_land[m] = getNewLand(laCrossroads);
+      hv_land[m] = getNewLand(laCrossroads);
       clearing::bpdata[m].root = NULL;
       }
     }
@@ -2138,7 +2138,7 @@ EX void moreBigStuff(cell *c) {
     auto p = get_voronoi_winner(c);
     auto ph = p.first;
     if(ph) {
-      eLand l = horodisk_land[ph];
+      eLand l = hv_land[ph];
       setland(c, l);
       if(isEquidLand(l)) c->landparam = 1-p.second;
       }
@@ -2153,7 +2153,7 @@ EX void moreBigStuff(cell *c) {
       preventbarriers(c);
       }
     if(have_alt(c) && celldistAlt(c) <= 0) {
-      eLand l = horodisk_land[c->master->alt->alt];
+      eLand l = hv_land[c->master->alt->alt];
       setland(c, l);
       if(l == laWhirlpool && celldistAlt(c) >= -1) {
         setland(c, laOcean);
diff --git a/landgen.cpp b/landgen.cpp
index a1ea4b56..2980032f 100644
--- a/landgen.cpp
+++ b/landgen.cpp
@@ -2090,7 +2090,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
       if(d >= 8) c->wall = waSea;
       if(d == 7 && !safety) {
 
-        if(ls::hv_structure() && c->master->alt && horodisk_land[c->master->alt->alt] == laWhirlpool) {
+        if(ls::hv_structure() && c->master->alt && hv_land[c->master->alt->alt] == laWhirlpool) {
           if(hrand(100) < 10) c->wall = waBoat;
           return;
           }
diff --git a/system.cpp b/system.cpp
index d36d4785..44ed4ab5 100644
--- a/system.cpp
+++ b/system.cpp
@@ -1770,8 +1770,8 @@ auto cgm = addHook(hooks_clearmemory, 40, [] () {
   crush_next.clear(); 
   crush_now.clear();
   rosemap.clear();
-  horodisk_land.clear();
-  horodisk_last_land.clear();
+  hv_land.clear();
+  hv_last_land.clear();
   for(auto &am: adj_memo) am.clear();
   }) + 
 addHook(hooks_gamedata, 0, [] (gamedata* gd) {