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

Merge branch 'my-commits-because-nothing-works-due-to-/dev/roots-crap' into 'develop'

Browse Source 
My commits because nothing works due to /dev/roots crap
This commit is contained in:
momo5502 2017-01-18 15:18:25 +01:00
commit c1ddfdf1e2
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/json11 vendored

@ -1 +1 @@
Subproject commit 8d7936d757dc0018af3863282316b6411d668edc
Subproject commit bf6316cf4376a6047b8754ac006218eb6c446bb3

2
deps/mongoose vendored

@ -1 +1 @@
Subproject commit f1d0b451b1cd26a30178cb307842a000ab1d1930
Subproject commit 4d9f8168b8bb264d4160b219b10ad43d2eb7c88a

2
deps/protobuf vendored

@ -1 +1 @@
Subproject commit c9cd6acd71e928164db10602b9d0837216ee367e
Subproject commit eed9951991c6ee7c629b5c4252444c372f7774fd

10
src/Components/Modules/AssetInterfaces/IXModel.cpp
View File

@ -202,7 +202,15 @@ namespace Assets
asset->physPreset->sndAliasPrefix = reader.readCString();
}
Components::AssetHandler::StoreTemporaryAsset(Game::XAssetType::ASSET_TYPE_PHYSPRESET, { asset->physPreset });
// This is an experiment, ak74 fails though
if (asset->name == "weapon_ak74u"s)
{
asset->physPreset = nullptr;
}
else
{
Components::AssetHandler::StoreTemporaryAsset(Game::XAssetType::ASSET_TYPE_PHYSPRESET, { asset->physPreset });
}
}
if (asset->physCollmap)

25
src/Components/Modules/ModelSurfs.cpp
View File

@ -189,23 +189,26 @@ namespace Components
{
hasCustomSurface = true;
auto buffer = ModelSurfs::BufferMap.find(surface->triIndices);
if (buffer != ModelSurfs::BufferMap.end())
if (!ModelSurfs::BufferMap.empty())
{
buffer->second->Release();
ModelSurfs::BufferMap.erase(buffer);
}
auto buffer = ModelSurfs::BufferMap.find(surface->triIndices);
if (buffer != ModelSurfs::BufferMap.end())
{
buffer->second->Release();
ModelSurfs::BufferMap.erase(buffer);
}
buffer = ModelSurfs::BufferMap.find(surface->verts0);
if (buffer != ModelSurfs::BufferMap.end())
{
buffer->second->Release();
ModelSurfs::BufferMap.erase(buffer);
buffer = ModelSurfs::BufferMap.find(surface->verts0);
if (buffer != ModelSurfs::BufferMap.end())
{
buffer->second->Release();
ModelSurfs::BufferMap.erase(buffer);
}
}
}
}
if (hasCustomSurface)
if (hasCustomSurface && !ModelSurfs::AllocMap.empty())
{
auto allocData = ModelSurfs::AllocMap.find(header.surfaces->name);
if (allocData != ModelSurfs::AllocMap.end())