diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-10 16:10:26 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-10 17:10:16 +0200 |
| commit | 102070791808ba03f4a5836a9073b87029e72858 (patch) | |
| tree | 8fbec1118aa8b61d45d492480194da6fdf8c2778 /src/servermain.cpp | |
| parent | c89d1cf072f4ac34cfb35eadd8c9890b3de1b922 (diff) | |
| download | minetest-102070791808ba03f4a5836a9073b87029e72858.tar.gz minetest-102070791808ba03f4a5836a9073b87029e72858.tar.bz2 minetest-102070791808ba03f4a5836a9073b87029e72858.zip | |
Fix addon and configuration file paths
Diffstat (limited to 'src/servermain.cpp')
| -rw-r--r-- | src/servermain.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/servermain.cpp b/src/servermain.cpp index 5eb5162ae..9be0c80ae 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -284,11 +284,14 @@ int main(int argc, char *argv[]) core::array<std::string> filenames; filenames.push_back(porting::path_user + DIR_DELIM + "minetest.conf"); + // Legacy configuration file location + filenames.push_back(porting::path_user + + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); #ifdef RUN_IN_PLACE // Try also from a lower level (to aid having the same configuration // for many RUN_IN_PLACE installs) filenames.push_back(porting::path_user + - DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); + DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); #endif for(u32 i=0; i<filenames.size(); i++) |