summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 43284611f..0531a8540 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -811,9 +811,6 @@ int main(int argc, char *argv[])
_("Set password"))));
allowed_options.insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG,
_("Disable main menu"))));
-#else
- allowed_options.insert(std::make_pair("daemon", ValueSpec(VALUETYPE_FLAG,
- _("Daemonize minetestserver"))));
#endif
Settings cmd_args;
@@ -921,12 +918,6 @@ int main(int argc, char *argv[])
<<", "<<minetest_build_info
<<std::endl;
-#ifdef SERVER
- if (cmd_args.exists("daemon")) {
- porting::daemonize();
- }
-#endif
-
/*
Basic initialization
*/
@@ -1478,7 +1469,7 @@ int main(int argc, char *argv[])
ELL_ERROR,
ELL_WARNING,
ELL_INFORMATION,
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
ELL_INFORMATION
#else
ELL_DEBUG
@@ -1929,14 +1920,6 @@ int main(int argc, char *argv[])
debugstreams_deinit();
-
-#ifdef SERVER
- if (cmd_args.exists("daemon"))
- {
- porting::cleanup_pid();
- }
-#endif
-
return retval;
}