Merge branch 'develop' of https://github.com/iw4x/iw4x-client into diamante/master-server
This commit is contained in:
commit
ea7cc4bfaa
@ -306,7 +306,7 @@ namespace Assets
|
||||
Game::CollisionPartition* destPartitions = buffer->dest<Game::CollisionPartition>();
|
||||
buffer->saveArray(asset->partitions, asset->partitionCount);
|
||||
|
||||
for (int i = 0; i < asset->partitionCount; ++i)
|
||||
for (size_t i = 0; i < asset->partitionCount; ++i)
|
||||
{
|
||||
Game::CollisionPartition* destPartition = &destPartitions[i];
|
||||
Game::CollisionPartition* partition = &asset->partitions[i];
|
||||
|
@ -3220,7 +3220,7 @@ namespace Game
|
||||
unsigned char* triEdgeIsWalkable;
|
||||
unsigned int borderCount;
|
||||
CollisionBorder* borders;
|
||||
int partitionCount;
|
||||
unsigned int partitionCount;
|
||||
CollisionPartition* partitions;
|
||||
unsigned int aabbTreeCount;
|
||||
CollisionAabbTree* aabbTrees;
|
||||
|
Loading…
Reference in New Issue
Block a user