summaryrefslogtreecommitdiff
path: root/src/engine/octa.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/octa.cpp')
-rw-r--r--src/engine/octa.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/octa.cpp b/src/engine/octa.cpp
index 93077c5..7886d59 100644
--- a/src/engine/octa.cpp
+++ b/src/engine/octa.cpp
@@ -989,7 +989,7 @@ static inline bool occludesface(const cube &c, int orient, const ivec &o, int si
return clipfacevecs(vf, numv, o[C[dim]], o[R[dim]], size, nf) < 3;
}
if(isentirelysolid(c)) return true;
- if(vmat != MAT_AIR && ((c.material&matmask) == vmat || (isliquid(vmat) && isclipped(c.material&MATF_VOLUME)))) return true;
+ if(vmat != MAT_AIR && ((c.material&matmask) == vmat)) return true;
if(touchingface(c, orient) && faceedges(c, orient) == F_SOLID) return true;
ivec2 cf[8];
int numc = clipfacevecs(vf, numv, o[C[dim]], o[R[dim]], size, cf);
@@ -1032,7 +1032,7 @@ bool visibleface(const cube &c, int orient, const ivec &co, int size, ushort mat
{
if(nmat != MAT_AIR && (o.material&matmask) == nmat) return true;
if(isentirelysolid(o)) return false;
- if(mat != MAT_AIR && ((o.material&matmask) == mat || (isliquid(mat) && (o.material&MATF_VOLUME) == MAT_GLASS))) return false;
+ if(mat != MAT_AIR && ((o.material&matmask) == mat || ((o.material&MATF_VOLUME) == MAT_GLASS))) return false;
if(isempty(o) || notouchingface(o, opp)) return true;
if(touchingface(o, opp) && faceedges(o, opp) == F_SOLID) return false;