X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fmeshload.c;h=5abd96e3304a9763c563f51269c79be0101dde5a;hp=7e3bd29436f38b745f2b79c5a4c5bcb6e62ce0de;hb=0fec45da13c2c9424bd8762759ff9fb54c08d572;hpb=1883deae4194ed84395bfb1102555b803a4f28e2

diff --git a/src/meshload.c b/src/meshload.c
index 7e3bd29..5abd96e 100644
--- a/src/meshload.c
+++ b/src/meshload.c
@@ -81,7 +81,7 @@ int load_mesh(struct g3d_mesh *mesh, const char *fname)
 				struct vertex_pos_color v;
 				int num;
 
-				num = sscanf(line + 2, "%f %f %f %f %f %f %f", &v.x, &v.y, &v.z, &v.x, &v.y, &v.z, &v.a);
+				num = sscanf(line + 2, "%f %f %f %f %f %f %f", &v.x, &v.y, &v.z, &v.r, &v.g, &v.b, &v.a);
 				if(num < 3) {
 					fprintf(stderr, "%s:%d: invalid vertex definition: \"%s\"\n", fname, line_num, line);
 					goto err;
@@ -200,7 +200,7 @@ int load_mesh(struct g3d_mesh *mesh, const char *fname)
 						}
 					}
 				}
-				if(i >= 3) found_quad = 1;
+				if(i > 3) found_quad = 1;
 			}
 			break;