nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Itemtypes.cpp: Fix crash when model is nullptr

Browse Source 
This is the first time this happened to me
This commit is contained in:
TotallyNotElite 2020-09-06 15:51:09 +02:00 committed by TotallyNotElite
parent 71c541af4f
commit 181b53e69f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/itemtypes.cpp
View File

@ -196,27 +196,30 @@ void ItemModelMapper::RegisterItem(std::string modelpath, k_EItemType type)
k_EItemType ItemModelMapper::GetItemType(CachedEntity *entity)
{
const uintptr_t model = (uintptr_t) RAW_ENT(entity)->GetModel();
for (const auto &it : map)
if (model)
{
if (it.first == model)
return it.second;
}
std::string path(g_IModelInfo->GetModelName((const model_t *) model));
bool set = false;
for (const auto &it : models)
{
// logging::Info("comparing [%s] to [%s]", path.c_str(),
// it.first.c_str());
if (it.first == path)
for (const auto &it : map)
{
// logging::Info("Found %s!", path.c_str());
map.emplace(model, it.second);
set = true;
break;
if (it.first == model)
return it.second;
}
std::string path(g_IModelInfo->GetModelName((const model_t *) model));
bool set = false;
for (const auto &it : models)
{
// logging::Info("comparing [%s] to [%s]", path.c_str(),
// it.first.c_str());
if (it.first == path)
{
// logging::Info("Found %s!", path.c_str());
map.emplace(model, it.second);
set = true;
break;
}
}
if (!set)
map.emplace(model, k_EItemType::ITEM_NONE);
}
if (!set)
map.emplace(model, k_EItemType::ITEM_NONE);
return k_EItemType::ITEM_NONE;
}