Merge branch 'master' into Mario/q3compat_sanity

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

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index dc9f1f080a74ddfa82e0dadc2208ab6d82cd7eea..4dac576ec5ba2bc6fe8cea88f402b5529d1bc651 100644 (file)
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -163,6 +163,9 @@ set debug_deglobalization_clear 0 "make the new wrappers set globals to NaN afte
 // disabling until it's complete
 set prvm_garbagecollection_enable 0
 
+set g_mapinfo_arena_compat 1 "allow mapinfo data to be pulled directly from .arena and .defi files if they exist, rather than generating .mapinfo files for them"
+set g_mapinfo_arena_generate 0 "allow mapinfo data to be pulled from .arena and .defi files during generation"
+
 // load console command aliases and settings
 exec commands.cfg