diff options
author | Perttu Ahola <celeron55@gmail.com> | 2012-03-19 23:54:56 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-20 00:08:00 +0200 |
commit | 97b693052cd5da228016afa6b31f07970b37569a (patch) | |
tree | a5389b936e6bf110de7c3463cd1d04e4a37f484a /src/main.cpp | |
parent | 19ed3bb1937419b5efdac4f4b6c07869e6bc6f08 (diff) | |
download | minetest-97b693052cd5da228016afa6b31f07970b37569a.tar.xz |
Flatten share/ and user/ in the source and for the RUN_IN_PLACE build
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 35595e5aa..75ff569aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1034,12 +1034,7 @@ int main(int argc, char *argv[]) // Check if the world is found from the default directory, and if // not, see if the legacy world directory exists. world_path = porting::path_user + DIR_DELIM + "worlds" + DIR_DELIM + "world"; -#ifdef RUN_IN_PLACE - std::string legacy_world_path = porting::path_user + DIR_DELIM + - ".." + DIR_DELIM + "world"; -#else std::string legacy_world_path = porting::path_user + DIR_DELIM + "world"; -#endif if(!fs::PathExists(world_path) && fs::PathExists(legacy_world_path)){ errorstream<<"Warning: Using legacy world directory \"" <<legacy_world_path<<"\""<<std::endl; |