diff options
Diffstat (limited to 'src/engine/octa.cpp')
| -rw-r--r-- | src/engine/octa.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/octa.cpp b/src/engine/octa.cpp index 7886d59..3d47cd3 100644 --- a/src/engine/octa.cpp +++ b/src/engine/octa.cpp @@ -305,10 +305,10 @@ int getmippedtexture(const cube &p, int orient) continue; } int tex = c[n].texture[orient]; - if(tex > DEFAULT_SKY) loopi(numtexs) if(texs[i] == tex) return tex; + loopi(numtexs) if(texs[i] == tex) return tex; texs[numtexs++] = tex; } - loopirev(numtexs) if(!i || texs[i] > DEFAULT_SKY) return texs[i]; + loopirev(numtexs) if(!i) return texs[i]; return DEFAULT_GEOM; } @@ -1032,7 +1032,6 @@ 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 || ((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; |