From df36f27b32f33dd3fd56fe99a5f5ab0bd15fcdc3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 2 Feb 2020 20:48:40 +0100
Subject: [PATCH] - added a few missing voxel checks.

---
 source/sw/src/jsector.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/sw/src/jsector.cpp b/source/sw/src/jsector.cpp
index 58a2a57ce..b3f7de8d0 100644
--- a/source/sw/src/jsector.cpp
+++ b/source/sw/src/jsector.cpp
@@ -979,7 +979,7 @@ JAnalyzeSprites(tspriteptr_t tspr)
     //if (bVoxelsOn)
     if (r_voxels)
     {
-        if (aVoxelArray[tspr->picnum].Voxel >= 0)
+        if (aVoxelArray[tspr->picnum].Voxel >= 0 && !(spriteext[tspr->owner].flags & SPREXT_NOTMD))
         {
             // Turn on voxels
             tspr->picnum = aVoxelArray[tspr->picnum].Voxel;     // Get the voxel number
@@ -992,6 +992,12 @@ JAnalyzeSprites(tspriteptr_t tspr)
         {
         case 764: // Gun barrel
 
+            if (!r_voxels || (spriteext[tspr->owner].flags & SPREXT_NOTMD))
+            {
+                tspr->cstat |= 16;
+                break;
+            }
+
             if (aVoxelArray[tspr->picnum].Voxel >= 0)
             {
                 // Turn on voxels