diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:16:47 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:16:47 +0300 |
| commit | 67a6bc4ab5be607c4a9f9a349dee629e864c2d42 (patch) | |
| tree | a07c396e114a21ccfede1bd9cd28470e1bd178b3 /src/main.cpp | |
| parent | ef397dca7c4adb4216e5063a01a487889bf28abd (diff) | |
| download | minetest-67a6bc4ab5be607c4a9f9a349dee629e864c2d42.tar.gz minetest-67a6bc4ab5be607c4a9f9a349dee629e864c2d42.tar.bz2 minetest-67a6bc4ab5be607c4a9f9a349dee629e864c2d42.zip | |
Fix map delete on windows (concatenate paths correctly with / or \ depending on OS)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 02cae0317..80daf7449 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1186,13 +1186,13 @@ int main(int argc, char *argv[]) // Create user data directory fs::CreateDir(porting::path_userdata); - init_gettext((porting::path_data+"/../locale").c_str()); + init_gettext((porting::path_data+DIR_DELIM+".."+DIR_DELIM+"locale").c_str()); // Initialize debug streams #ifdef RUN_IN_PLACE std::string debugfile = DEBUGFILE; #else - std::string debugfile = porting::path_userdata+"/"+DEBUGFILE; + std::string debugfile = porting::path_userdata+DIR_DELIM+DEBUGFILE; #endif debugstreams_init(disable_stderr, debugfile.c_str()); // Initialize debug stacks @@ -1244,9 +1244,11 @@ int main(int argc, char *argv[]) else { core::array<std::string> filenames; - filenames.push_back(porting::path_userdata + "/minetest.conf"); + filenames.push_back(porting::path_userdata + + DIR_DELIM + "minetest.conf"); #ifdef RUN_IN_PLACE - filenames.push_back(porting::path_userdata + "/../minetest.conf"); + filenames.push_back(porting::path_userdata + + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); #endif for(u32 i=0; i<filenames.size(); i++) @@ -1308,7 +1310,7 @@ int main(int argc, char *argv[]) port = 30000; // Map directory - std::string map_dir = porting::path_userdata+"/world"; + std::string map_dir = porting::path_userdata+DIR_DELIM+"world"; if(cmd_args.exists("map-dir")) map_dir = cmd_args.get("map-dir"); else if(g_settings->exists("map-dir")) |