summaryrefslogtreecommitdiff
path: root/src/engine/octaedit.cpp
diff options
context:
space:
mode:
authorxolatile2025-07-21 06:06:50 +0200
committerxolatile2025-07-21 06:06:50 +0200
commit09a43565940be30b233fa8730e65d531a454a03b (patch)
treee7ee95b2964b68611701643376ed500bb7d2ddcd /src/engine/octaedit.cpp
parent39de2c68c8a3f9cd7cffef9364a59c9d412b907e (diff)
downloadxolatile-badassbug-09a43565940be30b233fa8730e65d531a454a03b.tar.xz
xolatile-badassbug-09a43565940be30b233fa8730e65d531a454a03b.tar.zst
Cleaned 95% of -Wall -Wextra...
Diffstat (limited to 'src/engine/octaedit.cpp')
-rw-r--r--src/engine/octaedit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/octaedit.cpp b/src/engine/octaedit.cpp
index 3092221..af69db9 100644
--- a/src/engine/octaedit.cpp
+++ b/src/engine/octaedit.cpp
@@ -1987,7 +1987,7 @@ void mpeditface(int dir, int mode, selinfo &sel, bool local)
solidfaces(c);
cube &o = blockcube(x, y, 1, sel, -sel.grid);
loopi(6)
- c.texture[i] = o.children ? DEFAULT_GEOM : o.texture[i];
+ c.texture[i] = o.children ? (int) DEFAULT_GEOM : (int) o.texture[i];
}
else
emptyfaces(c);
@@ -2714,7 +2714,7 @@ void mpeditmat(int matid, int filter, selinfo &sel, bool local)
if(filter >= 0)
{
filtermat = filter&0xFFFF;
- filtermask = filtermat&(MATF_VOLUME|MATF_INDEX) ? MATF_VOLUME|MATF_INDEX : (filtermat&MATF_CLIP ? MATF_CLIP : filtermat);
+ filtermask = filtermat&(MATF_VOLUME|MATF_INDEX) ? (int) MATF_VOLUME|MATF_INDEX : (filtermat&MATF_CLIP ? (int) MATF_CLIP : (int) filtermat);
filtergeom = filter&~0xFFFF;
}
if(matid < 0)