Be lenient with extra slashes for CSM paths

minetest · Nov 9, 2019 · d961ece · d961ece
1 parent 485b669
commit d961ece
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;