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 ff5787269e4be9a7093a312bf18ce849e550a1be..78b27255c8bea8657368fd9b32808e141c2c9032 100644 (file)
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -152,6 +152,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