Cleared all warnings on GCC...

1 files changed, 11 insertions, 11 deletions

diff --git a/src/engine/octarender.cpp b/src/engine/octarender.cpp
index afbc7b2..aa1da76 100644
--- a/src/engine/octarender.cpp
+++ b/src/engine/octarender.cpp
@@ -452,7 +452,7 @@ extern const vec orientation_bitangent[8][3] = {
 	 vec(0, -1,  0), vec(-1, 0,  0), vec(-1,  0, 0) },
 };
 
-void addtris(const sortkey &key, int orient, vertex *verts, int *index, int numverts, int convex, int shadowmask, int tj) {
+void addtris(const sortkey &key, int orient, vertex *verts, int *index, int numverts, int shadowmask, int tj) {
 	int &total = vc.worldtris;
 	int edge = orient*(MAXFACEVERTS+1);
 	loopi(numverts-2) if(index[0]!=index[i+1] && index[i+1]!=index[i+2] && index[i+2]!=index[0]) {
@@ -591,8 +591,8 @@ void guessnormals(const vec *pos, int numverts, vec *normals) {
 	normals[3] = n2;
 }
 
-void addcubeverts(VSlot &vslot, int orient, int size, vec *pos, int convex, ushort texture, ushort lmid, vertinfo *vinfo, int numverts, int tj = -1, int grassy = 0, bool alpha = false, int layer = LAYER_TOP) {
-	(void) grassy;
+void addcubeverts(VSlot &vslot, int orient, int size, vec *pos, ushort texture, ushort lmid, vertinfo *vinfo, int numverts, int tj = -1, bool alpha = false, int layer = LAYER_TOP) {
+	(void) size;
 	int dim = dimension(orient);
 	int shadowmask = alpha ? 0 : calcshadowmask(pos, numverts);
 	LightMap *lm = NULL;
@@ -634,7 +634,7 @@ void addcubeverts(VSlot &vslot, int orient, int size, vec *pos, int convex, usho
 	}
 	if(lmid >= LMID_RESERVED) lmid = lm ? lm->tex : LMID_AMBIENT;
 	sortkey key(texture, lmid, !vslot.scroll.iszero() ? dim : 3, layer == LAYER_BLEND ? LAYER_BLEND : LAYER_TOP, alpha ? (vslot.alphaback ? ALPHA_BACK : (vslot.alphafront ? ALPHA_FRONT : NO_ALPHA)) : NO_ALPHA);
-	addtris(key, orient, verts, index, numverts, convex, shadowmask, tj);
+	addtris(key, orient, verts, index, numverts, shadowmask, tj);
 }
 
 struct edgegroup {
@@ -764,7 +764,7 @@ void gencubeedges(cube *c = worldroot, const ivec &co = ivec(0, 0, 0), int size
 	--neighbourdepth;
 }
 
-void gencubeverts(cube &c, const ivec &co, int size, int csi) {
+void gencubeverts(cube &c, const ivec &co, int size) {
 	if(!(c.visible&0xC0)) return;
 	int vismask = ~c.merged & 0x3F;
 	if(!(c.visible&0x80)) vismask &= c.visible;
@@ -796,13 +796,13 @@ void gencubeverts(cube &c, const ivec &co, int size, int csi) {
 		while(tj >= 0 && tjoints[tj].edge < i*(MAXFACEVERTS+1)) tj = tjoints[tj].next;
 		int hastj = tj >= 0 && tjoints[tj].edge < (i+1)*(MAXFACEVERTS+1) ? tj : -1;
 		if(!c.ext)
-			addcubeverts(vslot, i, size, pos, convex, c.texture[i], LMID_AMBIENT, NULL, numverts, hastj, 0, (c.material&MAT_ALPHA)!=0);
+			addcubeverts(vslot, i, size, pos, c.texture[i], LMID_AMBIENT, NULL, numverts, hastj, (c.material&MAT_ALPHA)!=0);
 		else {
 			const surfaceinfo &surf = c.ext->surfaces[i];
 			if(!surf.numverts || surf.numverts&LAYER_TOP)
-				addcubeverts(vslot, i, size, pos, convex, c.texture[i], surf.lmid[0], verts, numverts, hastj, 0, (c.material&MAT_ALPHA)!=0, LAYER_TOP|(surf.numverts&LAYER_BLEND));
+				addcubeverts(vslot, i, size, pos, c.texture[i], surf.lmid[0], verts, numverts, hastj, (c.material&MAT_ALPHA)!=0, LAYER_TOP|(surf.numverts&LAYER_BLEND));
 			if(surf.numverts&LAYER_BOTTOM)
-				addcubeverts(layer ? *layer : vslot, i, size, pos, convex, vslot.layer, surf.lmid[1], surf.numverts&LAYER_DUP ? verts + numverts : verts, numverts, hastj);
+				addcubeverts(layer ? *layer : vslot, i, size, pos, vslot.layer, surf.lmid[1], surf.numverts&LAYER_DUP ? verts + numverts : verts, numverts, hastj);
 		}
 	}
 }
@@ -920,7 +920,7 @@ int genmergedfaces(cube &c, const ivec &co, int size, int minlevel = -1) {
 		mf.numverts = surf.numverts;
 		mf.verts = c.ext->verts() + surf.verts;
 		mf.tjoints = -1;
-		int level = calcmergedsize(i, co, size, mf.verts, mf.numverts&MAXFACEVERTS);
+		int level = calcmergedsize(co, size, mf.verts, mf.numverts&MAXFACEVERTS);
 		if(level > minlevel) {
 			maxlevel = max(maxlevel, level);
 			while(tj >= 0 && tjoints[tj].edge < i*(MAXFACEVERTS+1)) tj = tjoints[tj].next;
@@ -971,7 +971,7 @@ void addmergedverts(int level, const ivec &o) {
 			pos[i] = vec(v.x, v.y, v.z).mul(1.0f/8).add(vo);
 		}
 		VSlot &vslot = lookupvslot(mf.tex, true);
-		addcubeverts(vslot, mf.orient, 1<<level, pos, 0, mf.tex, mf.lmid, mf.verts, numverts, mf.tjoints, 0, (mf.mat&MAT_ALPHA)!=0, mf.numverts&LAYER_BLEND);
+		addcubeverts(vslot, mf.orient, 1<<level, pos, mf.tex, mf.lmid, mf.verts, numverts, mf.tjoints, (mf.mat&MAT_ALPHA)!=0, mf.numverts&LAYER_BLEND);
 		vahasmerges |= MERGE_USE;
 	}
 	mfl.setsize(0);
@@ -1002,7 +1002,7 @@ void rendercube(cube &c, const ivec &co, int size, int csi, int &maxlevel) {  //
 		return;
 	}
 	if(!isempty(c)) {
-		gencubeverts(c, co, size, csi);
+		gencubeverts(c, co, size);
 		if(c.merged) maxlevel = max(maxlevel, genmergedfaces(c, co, size));
 	}
 	if(c.material != MAT_AIR) genmatsurfs(c, co, size, vc.matsurfs);