X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-common.cfg;h=58f057e20c70f8bc061b425fc4a30f22e816bbd7;hb=cf8037b6949e9af563c628a76d08e27a3528815a;hp=4dac576ec5ba2bc6fe8cea88f402b5529d1bc651;hpb=bbf5a4323eaf9de74aa9b5259dee6a922a0f2cfc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-common.cfg b/xonotic-common.cfg
index 4dac576ec..58f057e20 100644
--- a/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@ -123,15 +123,6 @@ utf8_enable 1
 mod_q3shader_default_polygonoffset -14
 mod_q3shader_default_polygonfactor 0
 
-// random charge stuff :P
-set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector"
-set g_weapon_charge_colormod_red_half 0
-set g_weapon_charge_colormod_green_half 0.5
-set g_weapon_charge_colormod_blue_half 1
-set g_weapon_charge_colormod_red_full 1
-set g_weapon_charge_colormod_green_full -0.5
-set g_weapon_charge_colormod_blue_full -1
-
 // session locking
 locksession 1
 
@@ -163,8 +154,7 @@ 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"
+set g_mapinfo_q3compat 1 "0: generate .mapinfo if none exists, ignoring .arena and .defi files. 1: read .arena and .defi files, don't generate .mapinfo. 2: generate .mapinfo if none exists using data from .arena files instead of reading them, .defi files continue to be used directly"
 
 // load console command aliases and settings
 exec commands.cfg