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

Browse Source
This commit is contained in:
TheApadayo 2016-12-29 22:15:43 -05:00
commit 3b986f18af
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/fmt vendored

@ -1 +1 @@
Subproject commit 02553d13a0242809fbe54f1d123f0e44eec70f2e Subproject commit b9aaa507fc49680d037fd84c043f747a395bce04

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

@ -700,12 +700,11 @@ namespace Assets
clipMap->cLeafBrushNodes = builder->getAllocator()->allocateArray<Game::cLeafBrushNode_t>(clipMap->numCLeafBrushNodes); clipMap->cLeafBrushNodes = builder->getAllocator()->allocateArray<Game::cLeafBrushNode_t>(clipMap->numCLeafBrushNodes);
for (int i = 0; i < clipMap->numCLeafBrushNodes; ++i) for (int i = 0; i < clipMap->numCLeafBrushNodes; ++i)
{ {
Game::cLeafBrushNode_t tmp = reader.read<Game::cLeafBrushNode_t>(); clipMap->cLeafBrushNodes[i] = reader.read<Game::cLeafBrushNode_t>();
memcpy(&clipMap->cLeafBrushNodes[i], &tmp, sizeof(Game::cLeafBrushNode_t));
if (tmp.leafBrushCount > 0) if (clipMap->cLeafBrushNodes[i].leafBrushCount > 0)
{ {
clipMap->cLeafBrushNodes[i].data.brushes = reader.readArray<unsigned short>(tmp.leafBrushCount); clipMap->cLeafBrushNodes[i].data.brushes = reader.readArray<unsigned short>(clipMap->cLeafBrushNodes[i].leafBrushCount);
} }
} }
} }
@ -867,7 +866,7 @@ namespace Assets
} }
// These mustn't be null, but they don't need to be valid. // These mustn't be null, but they don't need to be valid.
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2 && clipMap->dynEntCount[i]; ++i)
{ {
Utils::Stream::ClearPointer(&clipMap->dynEntPoseList[i]); Utils::Stream::ClearPointer(&clipMap->dynEntPoseList[i]);
Utils::Stream::ClearPointer(&clipMap->dynEntClientList[i]); Utils::Stream::ClearPointer(&clipMap->dynEntClientList[i]);