Fix potential crashes

- some compilers have problems with using locally redeclared loop vars after an internal loop
 - fix ordering of conditional checks
This commit is contained in:
Andy Maloney 2013-12-04 16:50:23 -05:00
parent 65099897f4
commit 0db6e1bc57
3 changed files with 6 additions and 6 deletions

View file

@ -3303,9 +3303,9 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream)
image.triggerDown = stream->readFlag();
image.altTriggerDown = stream->readFlag();
for (U32 i=0; i<ShapeBaseImageData::MaxGenericTriggers; ++i)
for (U32 j=0; j<ShapeBaseImageData::MaxGenericTriggers; ++j)
{
image.genericTrigger[i] = stream->readFlag();
image.genericTrigger[j] = stream->readFlag();
}
int count = stream->readInt(3);