diff options
Diffstat (limited to 'src/engine/octaedit.cpp')
| -rw-r--r-- | src/engine/octaedit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/octaedit.cpp b/src/engine/octaedit.cpp index 61d8917..4ba5e17 100644 --- a/src/engine/octaedit.cpp +++ b/src/engine/octaedit.cpp @@ -458,7 +458,7 @@ void readychanges(const ivec &bbmin, const ivec &bbmax, cube *c, const ivec &cor int hasmerges = c[i].ext->va->hasmerges; destroyva(c[i].ext->va); c[i].ext->va = NULL; - if(hasmerges) invalidatemerges(c[i], o, size, true); + if(hasmerges) invalidatemerges(c[i], true); } freeoctaentities(c[i]); c[i].ext->tjoints = -1; @@ -726,7 +726,7 @@ void freeeditinfo(editinfo *&e) { e = NULL; } -void pasteblock(block3 &b, selinfo &sel, bool local) { +void pasteblock(block3 &b, selinfo &sel) { sel.s = b.s; int o = sel.orient; sel.orient = b.orient; @@ -748,7 +748,7 @@ void mpcopy(editinfo *&e, selinfo &sel, bool local) { void mppaste(editinfo *&e, selinfo &sel, bool local) { if(e==NULL) return; if(local) game::edittrigger(sel, EDIT_PASTE); - if(e->copy) pasteblock(*e->copy, sel, local); + if(e->copy) pasteblock(*e->copy, sel); } void copy() { @@ -1603,6 +1603,7 @@ bool cleartexgui() { ICOMMAND(cleartexgui, "", (), intret(cleartexgui() ? 1 : 0)); void rendertexturepanel(int w, int h) { + (void) w; if((texpaneltimer -= curtime)>0 && editmode) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); pushhudmatrix(); |