Skip to content
Permalink
Browse files

Be lenient with extra slashes for CSM paths

  • Loading branch information
sfan5 committed Nov 9, 2019
1 parent 485b669 commit d961ece144c239a61ff46d830041249867656e9c
Showing with 12 additions and 3 deletions.
  1. +1 −1 clientmods/preview/example.lua
  2. +10 −1 src/client/client.cpp
  3. +1 −1 src/client/client.h
@@ -1,2 +1,2 @@
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")
@@ -1881,8 +1881,17 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename, bool cache)
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);
if (it == m_mod_vfs.end())
return nullptr;
@@ -378,7 +378,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
bool checkLocalPrivilege(const std::string &priv)
{ return checkPrivilege(priv); }
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;
bool registerModStorage(ModMetadata *meta) override;

0 comments on commit d961ece

Please sign in to comment.
You can’t perform that action at this time.