Make m_media_fetch_threads to contain MediaFetchThread* instead of MediaFetchThread

[minetest.git] / src / subgame.h

diff --git a/src/subgame.h b/src/subgame.h
index b201a740255acdaa735d0eecbea725fb1fc9cd4e..bffa86e285813da61adc76443bb55da2e3800ce9 100644 (file)
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2011 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.
 */
@@ -24,20 +24,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include <vector>
 
+#define WORLDNAME_BLACKLISTED_CHARS "/\\"
+
 struct SubgameSpec
 {
        std::string id; // "" = game does not exist
        std::string path;
-       std::set<std::string> addon_paths;
+       std::set<std::string> mods_paths;
        std::string name;
 
        SubgameSpec(const std::string &id_="",
                        const std::string &path_="",
-                       const std::set<std::string> &addon_paths_=std::set<std::string>(),
+                       const std::set<std::string> &mods_paths_=std::set<std::string>(),
                        const std::string &name_=""):
                id(id_),
                path(path_),
-               addon_paths(addon_paths_),
+               mods_paths(mods_paths_),
                name(name_)
        {}
 
@@ -47,11 +49,15 @@ struct SubgameSpec
        }
 };
 
+std::string getGameName(const std::string &game_path);
+
 SubgameSpec findSubgame(const std::string &id);
+SubgameSpec findWorldSubgame(const std::string &world_path);
 
 std::set<std::string> getAvailableGameIds();
 std::vector<SubgameSpec> getAvailableGames();
 
+bool getWorldExists(const std::string &world_path);
 std::string getWorldGameId(const std::string &world_path,
                bool can_be_legacy=false);