From 15075e9c1f51e4157f0c828251a61b768e4145d2 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 30 Sep 2022 22:16:25 +1000 Subject: [PATCH] Update description of g_mapinfo_q3compat and move its definition to the correct location --- xonotic-common.cfg | 3 +-- xonotic-server.cfg | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/xonotic-common.cfg b/xonotic-common.cfg index 4dac576ec..651cd1503 100644 --- a/xonotic-common.cfg +++ b/xonotic-common.cfg @@ -163,8 +163,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 diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 9140e6f80..ba9c114d3 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -505,7 +505,6 @@ sv_gameplayfix_gravityunaffectedbyticrate 1 sv_gameplayfix_nogravityonground 1 set sv_q3compat_changehitbox 0 "use Q3 player hitbox dimensions and camera height on Q3 maps (maps with an entry in a .arena or .defi file)" -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 and .defi files instead of reading them" set g_movement_highspeed 1 "multiplier scale for movement speed (applies to sv_maxspeed and sv_maxairspeed, also applies to air acceleration when g_movement_highspeed_q3_compat is set to 0)" set g_movement_highspeed_q3_compat 0 "apply speed modifiers to air movement in a more Q3-compatible way (only apply speed buffs and g_movement_highspeed to max air speed, not to acceleration)" -- 2.39.2