From a52755bf50e87a837e90fd784957906e5859f134 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 1 Mar 2019 01:20:14 +0100
Subject: [PATCH] some fixes due to weird action in git

---
 flags.cpp     | 2 --
 game.cpp      | 2 +-
 mapeditor.cpp | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/flags.cpp b/flags.cpp
index 761b96f0..fec6e844 100644
--- a/flags.cpp
+++ b/flags.cpp
@@ -769,6 +769,4 @@ 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 5eda1b6a..41cfea4c 100644
--- a/game.cpp
+++ b/game.cpp
@@ -3544,7 +3544,7 @@ void uncoverMinesFull(cell *c2) {
     items[itBombEgg] < 30 ? 2 :
     3;
   
-  bool nomine = false;
+  bool nomine = !normal_gravity_at(c2);
   if(!nomine && uncoverMines(c2, mineradius, 0, true) && markOrb(itOrbAether))
     nomine = true;
   
diff --git a/mapeditor.cpp b/mapeditor.cpp
index 3683bbfd..c057c837 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -1923,7 +1923,6 @@ namespace mapeditor {
       if(c == ls)
         textrans = inverse(V * applyPatterndir(ls, sio));
       
-#if CAP_TEXTURE      
       transmatrix mh = textrans * rgpushxto0(mouseh);
       transmatrix ml = textrans * rgpushxto0(lstart);