summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 18:19:56 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 18:19:56 +0000
commit9651fc998683bb2277b3f739f6797abc83fbcb2c (patch)
tree3ea385189a9c04939341f8cc936ea62e5d6da8af
parente4f9c8d9a2c73dd13c0a07b3f0042aad734c55d9 (diff)
downloadstarshatter-9651fc998683bb2277b3f739f6797abc83fbcb2c.zip
starshatter-9651fc998683bb2277b3f739f6797abc83fbcb2c.tar.gz
starshatter-9651fc998683bb2277b3f739f6797abc83fbcb2c.tar.bz2
Missed a few scoping issues, apparently
-rw-r--r--Magic2/ModelFileMAG.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Magic2/ModelFileMAG.cpp b/Magic2/ModelFileMAG.cpp
index ff9ed7e..4157434 100644
--- a/Magic2/ModelFileMAG.cpp
+++ b/Magic2/ModelFileMAG.cpp
@@ -551,13 +551,13 @@ ModelFileMAG::LoadMag5(FILE* fp, Model* m, double scale)
}
fread(texture_index_buffer, sizeof(float), poly_nverts, fp); // tu's
- for (vi = 0; vi < poly_nverts; vi++) {
+ for (int vi = 0; vi < poly_nverts; vi++) {
int v = poly.verts[vi];
vset->tu[v] = texture_index_buffer[vi];
}
fread(texture_index_buffer, sizeof(float), poly_nverts, fp); // tv's
- for (vi = 0; vi < poly_nverts; vi++) {
+ for (int vi = 0; vi < poly_nverts; vi++) {
int v = poly.verts[vi];
vset->tv[v] = texture_index_buffer[vi];
}
@@ -567,7 +567,7 @@ ModelFileMAG::LoadMag5(FILE* fp, Model* m, double scale)
}
// pass 2 (adjust vertex normals for flat polys):
- for (n = 0; n < npolys; n++) {
+ for (int n = 0; n < npolys; n++) {
Poly& poly = polys[n];
poly.plane = Plane(vset->loc[poly.verts[0]],
@@ -591,7 +591,7 @@ ModelFileMAG::LoadMag5(FILE* fp, Model* m, double scale)
// then assign them to cohesive segments:
Segment* segment = 0;
- for (n = 0; n < npolys; n++) {
+ for (int n = 0; n < npolys; n++) {
if (segment && segment->material == polys[n].material) {
segment->npolys++;
}