diff options
| author | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
| commit | e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0 (patch) | |
| tree | 79a5a18634069822b84b9c878d8d26742567c4a3 /src/subgame.cpp | |
| parent | be96fa2fb884fca571b92f63d33e0c5a592a2aad (diff) | |
| parent | 822723c2468ea763cdef447218059a5586e8e033 (diff) | |
| download | minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.gz minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.bz2 minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/subgame.cpp')
| -rw-r--r-- | src/subgame.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/subgame.cpp b/src/subgame.cpp index 19ad4e636..cdb546619 100644 --- a/src/subgame.cpp +++ b/src/subgame.cpp @@ -22,6 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "settings.h" #include "log.h" +#ifndef SERVER +#include "tile.h" // getImagePath +#endif #include "util/string.h" bool getGameMinetestConfig(const std::string &game_path, Settings &conf) @@ -94,7 +97,12 @@ SubgameSpec findSubgame(const std::string &id) std::string game_name = getGameName(game_path); if(game_name == "") game_name = id; - return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name); + std::string menuicon_path; +#ifndef SERVER + menuicon_path = getImagePath(game_path + DIR_DELIM + "menu" + DIR_DELIM + "icon.png"); +#endif + return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name, + menuicon_path); } SubgameSpec findWorldSubgame(const std::string &world_path) |