From 4e30c79c37d4c78aef8b13f8a4ffa4d2e59bf46b Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 6 Apr 2020 11:24:57 +0200
Subject: [PATCH] fixup to neon disabling textures

---
 celldrawer.cpp | 4 ++--
 drawing.cpp    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/celldrawer.cpp b/celldrawer.cpp
index a9b0fcd4..64509065 100644
--- a/celldrawer.cpp
+++ b/celldrawer.cpp
@@ -1618,9 +1618,9 @@ void celldrawer::draw_features_and_walls_3d() {
             poly.tinf = &texture::config.tinf3;
             poly.offset_texture = 0;
             }
-          else if(!floor_texture_vertices.empty())
+          else
           #endif
-          {
+          if(!floor_texture_vertices.empty() && neon_mode == eNeon::none) {
             poly.tinf = &floor_texture_vertices[qfi.fshape->id];
             ensure_vertex_number(*poly.tinf, poly.cnt);
             poly.offset_texture = 0;
diff --git a/drawing.cpp b/drawing.cpp
index 40fa95c5..60de8e0f 100644
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -2200,8 +2200,6 @@ EX dqi_poly& queuepolyat(const transmatrix& V, const hpcshape& h, color_t col, P
     part(col,1) = b; */
     part(col,2) = part(col,3) = (part(col,2) * 2 + part(col,3) + 1)/3;
     }
-  if(neon_mode != eNeon::none && (h.flags & POLY_TRIANGLES))
-    ptd.tinf = nullptr;
   if(neon_mode == eNeon::none) {
     ptd.color = (darkened(col >> 8) << 8) + (col & 0xFF);
     ptd.outline = poly_outline;
@@ -2242,6 +2240,8 @@ EX dqi_poly& queuepolyat(const transmatrix& V, const hpcshape& h, color_t col, P
   ptd.linewidth = vid.linewidth;
   ptd.flags = h.flags;
   ptd.tinf = h.tinf;
+  if(neon_mode != eNeon::none && (h.flags & POLY_TRIANGLES))
+    ptd.tinf = nullptr;
   ptd.offset_texture = h.texture_offset;
   ptd.intester = h.intester;
   return ptd;