remove unused param from calcmergedsize

Author: no-lex

src/engine/render/vacollect.cpp

@@ -939,7 +939,7 @@ int vacollect::genmergedfaces(cube &c, const ivec &co, int size, int minlevel)
             mf.numverts = surf.numverts;
             mf.verts = c.ext->verts() + surf.verts;
             mf.tjoints = -1;
-            const int level = calcmergedsize(i, co, size, mf.verts, mf.numverts&Face_MaxVerts);
+            const int level = calcmergedsize(co, size, mf.verts, mf.numverts&Face_MaxVerts);
             if(level > minlevel)
             {
                 maxlevel = std::max(maxlevel, level);

src/engine/world/light.cpp

@@ -464,7 +464,7 @@ static void calcsurfaces(cube &c, const ivec &co, int size, int usefacemask, int
             }
             if(c.merged&(1<<i))
             {
-                msz = 1<<calcmergedsize(i, mo, size, verts, numverts);
+                msz = 1<<calcmergedsize(mo, size, verts, numverts);
                 mo.mask(~(msz-1));
                 if(!(surf.numverts&Face_MaxVerts))
                 {

src/engine/world/octaworld.cpp

@@ -1817,7 +1817,7 @@ void cube::mincubeface(const cube &cu, int orient, const ivec &o, int size, cons
     cf.v2 = std::max(cf.v2, vc2);
 }
 
-int calcmergedsize(int orient, const ivec &co, int size, const vertinfo *verts, int numverts)
+int calcmergedsize(const ivec &co, int size, const vertinfo *verts, int numverts)
 {
     ushort x1 = verts[0].x,
            y1 = verts[0].y,

src/engine/world/octaworld.h

@@ -228,7 +228,7 @@ extern int classifyface(const cube &c, int orient, const ivec &co, int size);
 extern int visibletris(const cube &c, int orient, const ivec &co, int size, ushort vmat = Mat_Air, ushort nmat = Mat_Alpha, ushort matmask = Mat_Alpha);
 extern int visibleorient(const cube &c, int orient);
 extern void genfaceverts(const cube &c, int orient, std::array<ivec, 4> &v);
-extern int calcmergedsize(int orient, const ivec &co, int size, const vertinfo *verts, int numverts);
+extern int calcmergedsize(const ivec &co, int size, const vertinfo *verts, int numverts);
 extern void invalidatemerges(cube &c);
 extern void remip();