Don't erase modified_blocks

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index c36189933237acd8bd8c983206bce5f6607d1d5a..3c8bf53c53989338d0aea89126e62281d44610a3 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2012 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 Lesser General Public License as published by
@@ -74,9 +74,9 @@ SubgameSpec findSubgame(const std::string &id)
        }
        if(game_path == "")
                return SubgameSpec();
+       std::string gamemod_path = game_path + DIR_DELIM + "mods";
        // Find mod directories
        std::set<std::string> mods_paths;
-       mods_paths.insert(game_path + DIR_DELIM + "mods");
        if(!user_game)
                mods_paths.insert(share + DIR_DELIM + "mods" + DIR_DELIM + id);
        if(user != share || user_game)
@@ -84,7 +84,7 @@ SubgameSpec findSubgame(const std::string &id)
        std::string game_name = getGameName(game_path);
        if(game_name == "")
                game_name = id;
-       return SubgameSpec(id, game_path, mods_paths, game_name);
+       return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name);
 }
 
 SubgameSpec findWorldSubgame(const std::string &world_path)
@@ -96,7 +96,7 @@ SubgameSpec findWorldSubgame(const std::string &world_path)
                SubgameSpec gamespec;
                gamespec.id = world_gameid;
                gamespec.path = world_gamepath;
-               gamespec.mods_paths.insert(world_gamepath + DIR_DELIM + "mods");
+               gamespec.gamemods_path= world_gamepath + DIR_DELIM + "mods";
                gamespec.name = getGameName(world_gamepath);
                if(gamespec.name == "")
                        gamespec.name = "unknown";