unkn own block -> unkn own node

[dragonfireclient.git] / src / subgame.h

diff --git a/src/subgame.h b/src/subgame.h
index dd888ea0036ffc858ff2c34609731a32c248dd7a..b120b75425482d8d5ee1e43dd54611734a63942b 100644 (file)
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 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,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include <vector>
 
+class Settings;
+
+#define WORLDNAME_BLACKLISTED_CHARS "/\\"
+
 struct SubgameSpec
 {
        std::string id; // "" = game does not exist
-       std::string path;
-       std::set<std::string> mods_paths;
+       std::string path; // path to game
+       std::string gamemods_path; //path to mods of the game
+       std::set<std::string> addon_mods_paths; //paths to addon mods for this game
        std::string name;
 
        SubgameSpec(const std::string &id_="",
-                       const std::string &path_="",
-                       const std::set<std::string> &mods_paths_=std::set<std::string>(),
+                       const std::string &path_="",    
+                       const std::string &gamemods_path_="",
+                       const std::set<std::string> &addon_mods_paths_=std::set<std::string>(),
                        const std::string &name_=""):
                id(id_),
                path(path_),
-               mods_paths(mods_paths_),
+               gamemods_path(gamemods_path_),          
+               addon_mods_paths(addon_mods_paths_),
                name(name_)
        {}
 
@@ -47,6 +54,11 @@ struct SubgameSpec
        }
 };
 
+// minetest.conf
+bool getGameMinetestConfig(const std::string &game_path, Settings &conf);
+// game.conf
+bool getGameConfig(const std::string &game_path, Settings &conf);
+
 std::string getGameName(const std::string &game_path);
 
 SubgameSpec findSubgame(const std::string &id);