Merge branch 'master' into Mario/waterjump_fix

[xonotic/xonotic-data.pk3dir.git] / server.cfg

diff --git a/server.cfg b/server.cfg
index 7b5855f1e36b363c4efccadf6f1f39f4ae5817cf..8862efcc08cec1ca280eb5a8f6040be3be92ad7f 100644 (file)
--- a/server.cfg
+++ b/server.cfg
@@ -1,8 +1,16 @@
 echo
-echo You have not written any server.cfg file yet.
-echo The server will therefore run at default settings.
+echo ^1You have started a dedicated server but have not created
+echo ^1any server.cfg in your config directory.
 echo
-echo For information on how to set up a dedicated server,
-echo look at the files in the server/ subdirectory of your
-echo Xonotic install.
+echo ^1If you are seeing this when just trying to play Xonotic
+echo ^1(not host a server), try the other executables.
 echo
+echo ^1For information on how to set up a dedicated server,
+echo ^1look at the files in the server/ subdirectory of your
+echo ^1Xonotic install.
+echo
+echo ^1Quitting in 5 seconds.
+echo
+
+// see https://gitlab.com/xonotic/xonotic/issues/184
+defer 5 quit