From 162542b6160ec8629228466e6d08949674edcaff Mon Sep 17 00:00:00 2001
From: ? <zeno@attnam.com>
Date: Fri, 8 Feb 2019 17:08:00 +0100
Subject: [PATCH] parts pushed too fast

---
 flags.cpp             | 2 ++
 game.cpp              | 2 +-
 landgen.cpp           | 2 --
 mapeditor.cpp         | 6 +++---
 rogueviz-flocking.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flags.cpp b/flags.cpp
index 5dca5c28..706c3084 100644
--- a/flags.cpp
+++ b/flags.cpp
@@ -761,4 +761,6 @@ bool is_mirrorland(cell *c) {
   return among(c->land, laMirror, laMirrorOld);
   }
 
+bool isPushable(eWall w) { return w == waThumperOn; }
+
 }
diff --git a/game.cpp b/game.cpp
index fe19eaa0..9c744c71 100644
--- a/game.cpp
+++ b/game.cpp
@@ -3347,7 +3347,7 @@ void uncoverMinesFull(cell *c2) {
     items[itBombEgg] < 30 ? 2 :
     3;
   
-  bool nomine = !normal_gravity_at(c2);
+  bool nomine = false;
   if(!nomine && uncoverMines(c2, mineradius, 0, true) && markOrb(itOrbAether))
     nomine = true;
   
diff --git a/landgen.cpp b/landgen.cpp
index cb9fcdf6..fd931a13 100644
--- a/landgen.cpp
+++ b/landgen.cpp
@@ -58,8 +58,6 @@ void buildRedWall(cell *c, int gemchance) {
 
 bool reptilecheat = false;
 
-#define ONEMPTY if(d == 7 && passable(c, NULL, 0) && !safety)
-
 bool blizzard_no_escape1(cell *c, manual_celllister &cl) {
   if(!cl.add(c)) return true;
   if(c->item == itOrbSafety)
diff --git a/mapeditor.cpp b/mapeditor.cpp
index fe289590..0071c4da 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -5,6 +5,9 @@ namespace hr {
 
 namespace mapeditor {
 
+  hyperpoint lstart;
+  cell *lstartcell;
+
   struct editwhat {
     double dist;
     int rotid, symid, pointid;
@@ -1527,9 +1530,6 @@ namespace mapeditor {
     return true;
     }
 
-  hyperpoint lstart;
-  cell *lstartcell;
-
   void drawHandleKey(int sym, int uni) {
 
     handlePanning(sym, uni);
diff --git a/rogueviz-flocking.cpp b/rogueviz-flocking.cpp
index f7893f89..8924e920 100644
--- a/rogueviz-flocking.cpp
+++ b/rogueviz-flocking.cpp
@@ -365,7 +365,7 @@ namespace flocking {
       dialog::editNumber(N, 0, 1000, 1, 10, "", "smaller number = more precise simulation");
       });
 
-    dialog::addSelItem("change geometry", XLAT(ginf[geometry].name), 'g');
+    dialog::addSelItem("change geometry", XLAT(ginf[geometry].shortname), 'g');
     hr::showquotients = true;
     dialog::add_action(runGeometryExperiments);