ObjLoading: Load common ipaks depending on SP/MP/ZM for every zone and make sure to not double load them

This commit is contained in:
Jan
2020-02-10 23:02:44 +01:00
parent 53b03c1fdb
commit 80deff450d
4 changed files with 61 additions and 11 deletions

View File

@ -157,7 +157,7 @@ public:
std::string GetName() override
{
return utils::Path::GetFilename(m_path);
return utils::Path::GetFilenameWithoutExtension(m_path);
}
bool Initialize()

View File

@ -68,7 +68,7 @@ public:
}
}
IObjContainer* GetContainerByName(const std::string& name)
ContainerType* GetContainerByName(const std::string& name)
{
auto foundEntry = std::find_if(m_containers.begin(), m_containers.end(), [name](ObjContainerEntry& entry) -> bool
{