Fix many warnings about implicit integer conversions when compiling for 64 bits.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-20 01:20:08 -04:00
parent 85de3c41fb
commit ebc68023a7
39 changed files with 114 additions and 114 deletions
@@ -889,7 +889,7 @@ void ParticleSystem::draw(float x, float y, float angle, float sx, float sy, flo
{
VertexBuffer::Bind ibo_bind(*ibo.getVertexBuffer());
gl.drawElements(GL_TRIANGLES, ibo.getIndexCount(pCount), ibo.getType(), ibo.getPointer(0));
gl.drawElements(GL_TRIANGLES, (GLsizei) ibo.getIndexCount(pCount), ibo.getType(), ibo.getPointer(0));
}
glDisableVertexAttribArray(ATTRIB_TEXCOORD);
@@ -990,7 +990,7 @@ void ParticleSystem::update(float dt)
{
s = t * (float) k; // [0:numquads-1] (clamped below)
i = (s > 0.0f) ? (size_t) s : 0;
p->quadIndex = (i < k) ? i : k - 1;
p->quadIndex = (int) ((i < k) ? i : k - 1);
}
// Next particle.