Commit 96f77300 authored by hybrid's avatar hybrid

Fix possible infinite loop due to testing an unsigned for >=0

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3443 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 8b71ff58
...@@ -850,9 +850,9 @@ void STextureAtlas::addSource ( const c8 * name, video::IImage * image ) ...@@ -850,9 +850,9 @@ void STextureAtlas::addSource ( const c8 * name, video::IImage * image )
/*! /*!
*/ */
void STextureAtlas::getScale ( core::vector2df & scale ) void STextureAtlas::getScale(core::vector2df& scale)
{ {
for ( u32 i = atlas.size() - 1; i >= 0; --i) for (s32 i = static_cast<s32>(atlas.size()) - 1; i >= 0; --i)
{ {
if ( atlas[i].name == "_merged_" ) if ( atlas[i].name == "_merged_" )
{ {
...@@ -995,7 +995,6 @@ void STextureAtlas::create ( u32 border, E_TEXTURE_CLAMP texmode) ...@@ -995,7 +995,6 @@ void STextureAtlas::create ( u32 border, E_TEXTURE_CLAMP texmode)
master->setPixel ( atlas[i].pos.X + atlas[i].width + b, atlas[i].pos.Y + a, col[wrap[texmode][1]] ); master->setPixel ( atlas[i].pos.X + atlas[i].width + b, atlas[i].pos.Y + a, col[wrap[texmode][1]] );
} }
} }
} }
addSource ( "_merged_", master ); addSource ( "_merged_", master );
...@@ -1119,8 +1118,6 @@ SHalflifeHeader * CAnimatedMeshHalfLife::loadModel( io::IReadFile* file, const i ...@@ -1119,8 +1118,6 @@ SHalflifeHeader * CAnimatedMeshHalfLife::loadModel( io::IReadFile* file, const i
} }
/*! /*!
*/ */
f32 CAnimatedMeshHalfLife::SetController( s32 controllerIndex, f32 value ) f32 CAnimatedMeshHalfLife::SetController( s32 controllerIndex, f32 value )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment