mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
3292fb35ba
* gnu/packages/patches/luanti-paths.patch: Update and add upstream-status reference. Change-Id: Id98ed5b20d24560f9a9b2b3aff03294e385fd468
93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
Upstream-status: <https://github.com/luanti-org/luanti/pull/16816>
|
|
|
|
diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp
|
|
index d2b94a31e..2f76aba0f 100644
|
|
--- a/src/content/subgames.cpp
|
|
+++ b/src/content/subgames.cpp
|
|
@@ -63,20 +63,27 @@ struct GameFindPath
|
|
std::string getSubgamePathEnv()
|
|
{
|
|
static bool has_warned = false;
|
|
- char *subgame_path = getenv("MINETEST_SUBGAME_PATH");
|
|
- if (subgame_path && !has_warned) {
|
|
- warningstream << "MINETEST_SUBGAME_PATH is deprecated, use MINETEST_GAME_PATH instead."
|
|
- << std::endl;
|
|
- has_warned = true;
|
|
- }
|
|
-
|
|
- char *game_path = getenv("MINETEST_GAME_PATH");
|
|
|
|
- if (game_path)
|
|
- return std::string(game_path);
|
|
- else if (subgame_path)
|
|
- return std::string(subgame_path);
|
|
- return "";
|
|
+ if (char *luanti_game_path = getenv ("LUANTI_GAME_PATH"))
|
|
+ return std::string(luanti_game_path);
|
|
+ else if (char *minetest_game_path = getenv ("MINETEST_GAME_PATH")) {
|
|
+ if (!has_warned) {
|
|
+ warningstream << "MINETEST_GAME_PATH is deprecated, use LUANTI_GAME_PATH instead."
|
|
+ << std::endl;
|
|
+ has_warned = true;
|
|
+ }
|
|
+ return std::string(minetest_game_path);
|
|
+ }
|
|
+ else if (char *minetest_subgame_path = getenv ("MINETEST_SUBGAME_PATH")) {
|
|
+ if (!has_warned) {
|
|
+ warningstream << "MINETEST_SUBGAME_PATH is deprecated, use LUANTI_GAME_PATH instead."
|
|
+ << std::endl;
|
|
+ has_warned = true;
|
|
+ }
|
|
+ return std::string(minetest_subgame_path);
|
|
+ }
|
|
+ else
|
|
+ return "";
|
|
}
|
|
|
|
static SubgameSpec getSubgameSpec(const std::string &game_id,
|
|
@@ -279,8 +286,20 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy)
|
|
|
|
std::string getWorldPathEnv()
|
|
{
|
|
- char *world_path = getenv("MINETEST_WORLD_PATH");
|
|
- return world_path ? std::string(world_path) : "";
|
|
+ static bool has_warned = false;
|
|
+ char *world_path = nullptr;
|
|
+ if (world_path = getenv("LUANTI_WORLD_PATH"))
|
|
+ return std::string(world_path);
|
|
+ else if (world_path = getenv("MINETEST_WORLD_PATH")) {
|
|
+ if (!has_warned) {
|
|
+ warningstream << "MINETEST_WORLD_PATH is deprecated, use LUANTI_WORLD_PATH instead."
|
|
+ << std::endl;
|
|
+ has_warned = true;
|
|
+ }
|
|
+ return std::string(world_path);
|
|
+ }
|
|
+ else
|
|
+ return "";
|
|
}
|
|
|
|
std::vector<WorldSpec> getAvailableWorlds()
|
|
@@ -413,8 +432,20 @@ void loadGameConfAndInitWorld(const std::string &path, const std::string &name,
|
|
|
|
std::vector<std::string> getEnvModPaths()
|
|
{
|
|
- const char *c_mod_path = getenv("MINETEST_MOD_PATH");
|
|
+ static bool has_warned = false;
|
|
std::vector<std::string> paths;
|
|
+ if (const char *c_mod_path = getenv("MINETEST_MOD_PATH")) {
|
|
+ if (!has_warned) {
|
|
+ warningstream << "MINETEST_MOD_PATH is deprecated, use LUANTI_MOD_PATH instead."
|
|
+ << std::endl;
|
|
+ has_warned = true;
|
|
+ }
|
|
+ Strfnd search_paths(c_mod_path ? c_mod_path : "");
|
|
+ while (!search_paths.at_end())
|
|
+ paths.push_back(search_paths.next(PATH_DELIM));
|
|
+
|
|
+ }
|
|
+ const char *c_mod_path = getenv("LUANTI_MOD_PATH");
|
|
Strfnd search_paths(c_mod_path ? c_mod_path : "");
|
|
while (!search_paths.at_end())
|
|
paths.push_back(search_paths.next(PATH_DELIM));
|