From d8509a052872e55255ccac2c535825f580e182cb Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Tue, 3 Aug 2021 17:15:53 -0700
Subject: [PATCH] Fix terra statue interactions with Chaos+Icy, BSoC swap, Alch
 dup

---
 celldrawer.cpp |  4 ++--
 complex2.cpp   | 12 ++++++------
 help.cpp       |  2 +-
 landgen.cpp    |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/celldrawer.cpp b/celldrawer.cpp
index 4dab9017..8d7261bb 100644
--- a/celldrawer.cpp
+++ b/celldrawer.cpp
@@ -1369,7 +1369,7 @@ void celldrawer::draw_features() {
     
     case waTerraWarrior:
       #if CAP_COMPLEX2
-      drawTerraWarrior(V, terracotta::randterra ? (c->landparam & 7) : (5 - (c->landparam & 7)), 7, 0);
+      drawTerraWarrior(V, terracotta::randterra ? (c->wparam & 7) : (5 - (c->wparam & 7)), 7, 0);
       #endif
       break;
     
@@ -2222,7 +2222,7 @@ void celldrawer::draw_wall_full() {
     if(c->wall == waFireTrap)
       asciicol = trapcol[c->wparam & 3];
     if(c->wall == waTerraWarrior)
-      asciicol = terracol[c->landparam & 7];
+      asciicol = terracol[c->wparam & 7];
 
     if(c->wall == waMineOpen) {
       int mines = countMinesAround(c);
diff --git a/complex2.cpp b/complex2.cpp
index 7a010abd..f5c4e4d8 100644
--- a/complex2.cpp
+++ b/complex2.cpp
@@ -654,15 +654,15 @@ EX void check(cell *c) {
   if(c->wall == waTerraWarrior && !c->monst && !racing::on) {
     bool live = false;
     if(randterra) {
-      c->landparam++;
-      if((c->landparam == 3 && hrand(3) == 0) ||
-        (c->landparam == 4 && hrand(2) == 0) || 
-        c->landparam == 5)
+      c->wparam++;
+      if((c->wparam == 3 && hrand(3) == 0) ||
+        (c->wparam == 4 && hrand(2) == 0) ||
+        c->wparam == 5)
           live = true;
       }
     else {
-      c->landparam--;
-      live = !c->landparam;
+      c->wparam--;
+      live = !c->wparam;
       }
     if(live)
       c->monst = moTerraWarrior,
diff --git a/help.cpp b/help.cpp
index a3b9e2e5..4c02f4cf 100644
--- a/help.cpp
+++ b/help.cpp
@@ -944,7 +944,7 @@ EX void describeMouseover() {
       out += ", "; out += XLAT1(winf[c->wall].name); 
       
       if(c->wall == waRose) out += " (" + its(7-rosephase) + ")";
-      if(c->wall == waTerraWarrior) out += " (" + its(c->landparam) + ")";
+      if(c->wall == waTerraWarrior) out += " (" + its(c->wparam) + ")";
       #if CAP_COMPLEX2
       if(isDie(c->wall)) out += " (" + dice::describe(c) + ")";
       #endif
diff --git a/landgen.cpp b/landgen.cpp
index 44679ed5..64dd7564 100644
--- a/landgen.cpp
+++ b/landgen.cpp
@@ -1198,11 +1198,11 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
           createArrowTrapAt(c, laTerracotta);
         if(pseudohept(c) && hrand(100) < 40 && c->wall == waNone && !racing::on) {
           c->wall = waTerraWarrior;
-          c->landparam = terracotta::randterra ? 0 : 3 + hrand(3);
+          c->wparam = terracotta::randterra ? 0 : 3 + hrand(3);
           if(hrand(100) < items[itTerra]-10)
-            c->landparam--;
+            c->wparam--;
           if(hrand(100) < items[itTerra]-10)
-            c->landparam--;
+            c->wparam--;
           }
         }
       if(d == 7) {