1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Flatten share/ and user/ in the source and for the RUN_IN_PLACE build

This commit is contained in:
Perttu Ahola 2012-03-19 23:54:56 +02:00
parent 19ed3bb193
commit 97b693052c
122 changed files with 57 additions and 43 deletions

View file

@ -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;