Allow the LUA API to set animations to meshes as well as the animation speed. Also...

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 00b63bdcfc62b62b9c92f5432a2df5e52cbbb6ac..c36189933237acd8bd8c983206bce5f6607d1d5a 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "settings.h"
 #include "log.h"
-#include "utility_string.h"
+#include "util/string.h"
 
 std::string getGameName(const std::string &game_path)
 {
@@ -53,14 +53,14 @@ SubgameSpec findSubgame(const std::string &id)
        std::string share = porting::path_share;
        std::string user = porting::path_user;
        std::vector<GameFindPath> find_paths;
-       find_paths.push_back(GameFindPath(
-                       user + DIR_DELIM + "games" + DIR_DELIM + id, true));
        find_paths.push_back(GameFindPath(
                        user + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true));
        find_paths.push_back(GameFindPath(
-                       share + DIR_DELIM + "games" + DIR_DELIM + id, false));
+                       user + DIR_DELIM + "games" + DIR_DELIM + id, true));
        find_paths.push_back(GameFindPath(
                        share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", false));
+       find_paths.push_back(GameFindPath(
+                       share + DIR_DELIM + "games" + DIR_DELIM + id, false));
        // Find game directory
        std::string game_path;
        bool user_game = true; // Game is in user's directory
@@ -87,6 +87,24 @@ SubgameSpec findSubgame(const std::string &id)
        return SubgameSpec(id, game_path, mods_paths, game_name);
 }
 
+SubgameSpec findWorldSubgame(const std::string &world_path)
+{
+       std::string world_gameid = getWorldGameId(world_path, true);
+       // See if world contains an embedded game; if so, use it.
+       std::string world_gamepath = world_path + DIR_DELIM + "game";
+       if(fs::PathExists(world_gamepath)){
+               SubgameSpec gamespec;
+               gamespec.id = world_gameid;
+               gamespec.path = world_gamepath;
+               gamespec.mods_paths.insert(world_gamepath + DIR_DELIM + "mods");
+               gamespec.name = getGameName(world_gamepath);
+               if(gamespec.name == "")
+                       gamespec.name = "unknown";
+               return gamespec;
+       }
+       return findSubgame(world_gameid);
+}
+
 std::set<std::string> getAvailableGameIds()
 {
        std::set<std::string> gameids;