From 2708f0769e7027f25c97159dff8802fcc9dde37f Mon Sep 17 00:00:00 2001 From: Mrchiantos <51173452+Mrchiantos@users.noreply.github.com> Date: Thu, 1 Aug 2019 12:03:32 +0200 Subject: [PATCH] test --- doc/lua_api.txt | 16 ++-------------- src/mods.cpp | 3 +++ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 5d169a811..f8081bc34 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -77,22 +77,10 @@ Mod load path ------------- Generic: -* `$path_share/games/gameid/mods/` -* `$path_share/mods/` +* `$path_share/games/gameid/files/` +* `$path_share/files/` * `$worldpath/worldmods/` -In a run-in-place version (e.g. the distributed windows version): - -* `minetest-0.4.x/games/gameid/mods/` -* `minetest-0.4.x/mods/` (User-installed mods) -* `minetest-0.4.x/worlds/worldname/worldmods/` - -On an installed version on Linux: - -* `/usr/share/minetest/games/gameid/mods/` -* `$HOME/.minetest/mods/` (User-installed mods) -* `$HOME/.minetest/worlds/worldname/worldmods` - Mod load path for world-specific games -------------------------------------- It is possible to include a game in a world; in this case, no mods or diff --git a/src/mods.cpp b/src/mods.cpp index 3ca8cc24e..dc4cff1a6 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -345,6 +345,9 @@ ServerModConfiguration::ServerModConfiguration(const std::string &worldpath): addModsInPath(gamespec.gamemods_path); addModsInPath(worldpath + DIR_DELIM + "worldmods"); + //Data for not duplicate mods for all games. + addModsInPath(porting::path_share + DIR_DELIM + "files"); + // Load normal mods std::string worldmt = worldpath + DIR_DELIM + "world.mt"; addModsFormConfig(worldmt, gamespec.addon_mods_paths);