summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Magic2/l3ds.cpp4
-rw-r--r--nGenEx/Layout.cpp10
2 files changed, 7 insertions, 7 deletions
diff --git a/Magic2/l3ds.cpp b/Magic2/l3ds.cpp
index dc93c2f..1683395 100644
--- a/Magic2/l3ds.cpp
+++ b/Magic2/l3ds.cpp
@@ -767,7 +767,7 @@ void LMesh::CalcTextureSpace()
// now for each vertex build a list of face that share this vertex
std::vector< std::vector<int> > array;
array.resize(m_vertices.size());
- for (int i=0; i<m_triangles.size(); i++)
+ for (int i=0; i<(int)m_triangles.size(); i++)
{
uint k = m_tris[i].a;
array[k].push_back(i);
@@ -780,7 +780,7 @@ void LMesh::CalcTextureSpace()
}
// now average the tangents and compute the binormals as (tangent X normal)
- for (int i=0; i<m_vertices.size(); i++)
+ for (int i=0; i<(int)m_vertices.size(); i++)
{
v1 = zero3;
v2 = zero3;
diff --git a/nGenEx/Layout.cpp b/nGenEx/Layout.cpp
index afca9e7..651e6ca 100644
--- a/nGenEx/Layout.cpp
+++ b/nGenEx/Layout.cpp
@@ -1,6 +1,6 @@
/* Project nGenEx
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: nGenEx.lib
FILE: Layout.cpp
@@ -48,11 +48,11 @@ Layout::DoLayout(ActiveWindow* panel)
Rect rp = panel->GetRect();
if (c.x < 0) c.x = 0;
- else if (c.x >= cell_x.size()) c.x = cell_x.size() - 1;
+ else if (c.x >= (int)cell_x.size()) c.x = cell_x.size() - 1;
if (c.y < 0) c.y = 0;
- else if (c.y >= cell_y.size()) c.y = cell_y.size() - 1;
- if (c.x+c.w >= cell_x.size()) c.w = cell_x.size() - c.x - 1;
- if (c.y+c.h >= cell_y.size()) c.h = cell_y.size() - c.y - 1;
+ else if (c.y >= (int)cell_y.size()) c.y = cell_y.size() - 1;
+ if (c.x+c.w >= (int)cell_x.size()) c.w = cell_x.size() - c.x - 1;
+ if (c.y+c.h >= (int)cell_y.size()) c.h = cell_y.size() - c.y - 1;
r.x = cell_x[c.x] + w->GetCellInsets().left;
r.y = cell_y[c.y] + w->GetCellInsets().top;