diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:46:55 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:47:55 +0200 |
| commit | 96bee29e35f0790657fbd8bb67d2af79b498255c (patch) | |
| tree | 0712c75629ab16fad84af11050ef94d8c8ac8137 /src/main.cpp | |
| parent | 82ea53499710c9a4e92ec595d8c14c417bdd0ee6 (diff) | |
| parent | f2051c98223d087c8ba3d7e4514935781c93ed1c (diff) | |
| download | minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.gz minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.bz2 minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index da17b84bc..df0a7ff31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1298,7 +1298,7 @@ int main(int argc, char *argv[]) g_timegetter = new SimpleTimeGetter(); // Create server - Server server(map_dir.c_str()); + Server server(map_dir.c_str(), configpath); server.start(port); // Run server @@ -1637,7 +1637,8 @@ int main(int argc, char *argv[]) password, address, port, - error_message + error_message, + configpath ); } //try |