Merge pull request #581 from tdev/vs2012_fixes

Visual Studio 2012 32Bit Level 4 Warning fixes
This commit is contained in:
Thomas Fischer 2014-03-17 10:02:19 +01:00
commit 7239c791f2
13 changed files with 24 additions and 34 deletions

View file

@ -3158,9 +3158,9 @@ U32 ShapeBase::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
stream->writeFlag(image.triggerDown);
stream->writeFlag(image.altTriggerDown);
for (U32 i=0; i<ShapeBaseImageData::MaxGenericTriggers; ++i)
for (U32 j=0; j<ShapeBaseImageData::MaxGenericTriggers; ++j)
{
stream->writeFlag(image.genericTrigger[i]);
stream->writeFlag(image.genericTrigger[j]);
}
stream->writeInt(image.fireCount,3);