Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6fc54b53aa730f9154f7c4d2db219bd4a0592f1f..5535d9cceea250f59dc2d592ec28fe929ec17229 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -995,7 +995,8 @@ seta cl_notify_carried_items "3" "notify you of carried items when you obtain th
 
 // startmap_dm is used when running with the -listen or -dedicated commandline options
 set serverconfig server.cfg
-alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
+set _sv_init 0
+alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
 alias sv_loadconfig "exec $serverconfig"
 alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
 
@@ -1628,6 +1629,7 @@ set capturelimit 0
 // these entities are not referenced by anything directly, they just represent
 // teams and are found by find() when needed
 prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
+prvm_backtraceforwarnings 1
 
 sv_allowdownloads_inarchive 1 // for csprogs.dat
 sv_allowdownloads 0 // download protocol is evil
@@ -1778,6 +1780,11 @@ seta cl_gentle_damage 0          "client side gentle mode (only replaces damage flash);
 set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)"
 
 set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."
+set g_bastet 0 "don't try"
+set g_loituma 0 "no, really"
+
+set _urllib_nextslot 0 "temp variable"
+set cl_warpzone_usetrace 1 "do not touch"
 
 set cl_effects_lightningarc_simple 0
 set cl_effects_lightningarc_segmentlength 64