Translated using Weblate (Japanese)

[oweals/minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 864732876049c9206ebb4de7229e57cd8a075a1d..a3fdce15afe66a9838f1da420533dee033eb53a1 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -21,16 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "filesys.h"
 #include "settings.h"
-#include "main.h"
 #include "log.h"
 #include "strfnd.h"
 #include "defaultsettings.h"  // for override_default_settings
 #include "mapgen.h"  // for MapgenParams
-#include "main.h" // for g_settings
+#include "util/string.h"
+
 #ifndef SERVER
-#include "client/tile.h" // getImagePath
+       #include "client/tile.h" // getImagePath
 #endif
-#include "util/string.h"
 
 bool getGameMinetestConfig(const std::string &game_path, Settings &conf)
 {
@@ -164,7 +163,7 @@ std::set<std::string> getAvailableGameIds()
        }
 
        for(std::set<std::string>::const_iterator i = gamespaths.begin();
-                       i != gamespaths.end(); i++){
+                       i != gamespaths.end(); ++i){
                std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
                for(u32 j=0; j<dirlist.size(); j++){
                        if(!dirlist[j].dir)
@@ -190,7 +189,7 @@ std::vector<SubgameSpec> getAvailableGames()
        std::vector<SubgameSpec> specs;
        std::set<std::string> gameids = getAvailableGameIds();
        for(std::set<std::string>::const_iterator i = gameids.begin();
-                       i != gameids.end(); i++)
+                       i != gameids.end(); ++i)
                specs.push_back(findSubgame(*i));
        return specs;
 }
@@ -231,7 +230,7 @@ std::vector<WorldSpec> getAvailableWorlds()
        worldspaths.insert(porting::path_user + DIR_DELIM + "worlds");
        infostream<<"Searching worlds..."<<std::endl;
        for(std::set<std::string>::const_iterator i = worldspaths.begin();
-                       i != worldspaths.end(); i++){
+                       i != worldspaths.end(); ++i){
                infostream<<"  In "<<(*i)<<": "<<std::endl;
                std::vector<fs::DirListNode> dirvector = fs::GetDirListing(*i);
                for(u32 j=0; j<dirvector.size(); j++){