Be lenient with extra slashes for CSM paths

diff --git a/clientmods/preview/example.lua b/clientmods/preview/example.lua
index 41dc3b2847238059877840213903da451d925054..2f42eef64624cc850d72ea91a9ec23272c058ede 100644 (file)
--- a/clientmods/preview/example.lua
+++ b/clientmods/preview/example.lua
@@ -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")

diff --git a/src/client/client.cpp b/src/client/client.cpp
index fd7673a994101eae9a24b93845cae00a51ef4650..0908e52f9e674d0c40d6362e8a2b696480d192d8 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -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;

diff --git a/src/client/client.h b/src/client/client.h
index 40ad4c064ae4bb7bb19b2183cde72f8b771bf5e2..53b47edd009c1dcd7e4e1d8499fc093e6912392c 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -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;