BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Be lenient with extra slashes for CSM paths

Browse Source
This commit is contained in:
sfan5 2019-11-09 15:11:21 +01:00
parent 485b669840
commit d961ece144
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientmods/preview/example.lua
View File

@ -1,2 +1,2 @@
print("Loaded example file!, loading more examples") print("Loaded example file!, loading more examples")
dofile(core.get_modpath(core.get_current_modname()) .. "examples/first.lua") dofile(core.get_modpath(core.get_current_modname()) .. "/examples/first.lua")

11
src/client/client.cpp
View File

@ -1881,8 +1881,17 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename, bool cache)
return mesh; return mesh;
} }
const std::string* Client::getModFile(const std::string &filename) const std::string* Client::getModFile(std::string filename)
{ {
// strip dir delimiter from beginning of path
auto pos = filename.find_first_of(':');
if (pos == std::string::npos)
return nullptr;
pos++;
auto pos2 = filename.find_first_not_of("/", pos);
if (pos2 > pos)
filename.erase(pos, pos2 - pos);
StringMap::const_iterator it = m_mod_vfs.find(filename); StringMap::const_iterator it = m_mod_vfs.find(filename);
if (it == m_mod_vfs.end()) if (it == m_mod_vfs.end())
return nullptr; return nullptr;

2
src/client/client.h
View File

@ -378,7 +378,7 @@ public:
bool checkLocalPrivilege(const std::string &priv) bool checkLocalPrivilege(const std::string &priv)
{ return checkPrivilege(priv); } { return checkPrivilege(priv); }
virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false); virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
const std::string* getModFile(const std::string &filename); const std::string* getModFile(std::string filename);
std::string getModStoragePath() const override; std::string getModStoragePath() const override;
bool registerModStorage(ModMetadata *meta) override; bool registerModStorage(ModMetadata *meta) override;