games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Only remove extension if it belongs to specified file type

Browse Source 
This one fixes issue 1557
Now it's possible to load maps with dots in filename.
This commit is contained in:
ArseniyShestakov
2015-01-26 16:40:49 +03:00
parent 86fde2ba54
commit 19d1de3142
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/filesystem/ResourceID.cpp
View File

@@ -35,14 +35,14 @@ ResourceID::ResourceID()
ResourceID::ResourceID(std::string name) ResourceID::ResourceID(std::string name)
{ {
CFileInfo info(std::move(name)); CFileInfo info(std::move(name));
setName(info.getStem());
setType(info.getType()); setType(info.getType());
setName(info.getStem());
} }
ResourceID::ResourceID(std::string name, EResType::Type type) ResourceID::ResourceID(std::string name, EResType::Type type)
{ {
setName(std::move(name));
setType(type); setType(type);
setName(std::move(name));
} }
std::string ResourceID::getName() const std::string ResourceID::getName() const
@@ -61,8 +61,11 @@ void ResourceID::setName(std::string name)
size_t dotPos = this->name.find_last_of("/."); size_t dotPos = this->name.find_last_of("/.");
if(dotPos != std::string::npos && this->name[dotPos] == '.') if(dotPos != std::string::npos && this->name[dotPos] == '.'
&& this->type == EResTypeHelper::getTypeFromExtension(this->name.substr(dotPos)))
{
this->name.erase(dotPos); this->name.erase(dotPos);
}
#ifdef ENABLE_TRIVIAL_TOUPPER #ifdef ENABLE_TRIVIAL_TOUPPER
toUpper(this->name); toUpper(this->name);