Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'develop' of https://github.com/iw4x/iw4x-client into diamante/master-server

Browse Source
This commit is contained in:
Louvenarde 2023-08-29 00:09:46 +02:00
commit ea7cc4bfaa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/AssetInterfaces/IclipMap_t.cpp
View File

@ -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];

2
src/Game/Structs.hpp
View File

@ -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;