From 97b693052cd5da228016afa6b31f07970b37569a Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 19 Mar 2012 23:54:56 +0200 Subject: Flatten share/ and user/ in the source and for the RUN_IN_PLACE build --- src/main.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/main.cpp') 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 \"" <