Prefer _game postfix in game names (to be squashed to the previous commit)

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 00b63bdcfc62b62b9c92f5432a2df5e52cbbb6ac..243bdc04805cfeeeb84d1e3e332c9ad4072e4418 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -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