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