summaryrefslogtreecommitdiff
path: root/src/engine/octa.cpp
diff options
context:
space:
mode:
authorxolatile2025-08-05 10:40:01 +0200
committerxolatile2025-08-05 10:40:01 +0200
commita2a16b85572b1d28b0cd4901ea7348750732a740 (patch)
tree6287cdf8331e821f9fe1e0adadc664a59634a812 /src/engine/octa.cpp
parent6762e292d02e37a69a807e01493d4e14319cca33 (diff)
downloadxolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.xz
xolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.zst
Few more changes, please do not compile...
Diffstat (limited to 'src/engine/octa.cpp')
-rw-r--r--src/engine/octa.cpp5
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;