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

Merge branch 'upstream/master'

Browse source
This commit is contained in:
Nils Dagsson Moskopp 2011-07-30 19:46:55 +02:00
commit 96bee29e35
26 changed files with 375 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.cpp
View file

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