Enable g_spawnpoints_auto_move_out_of_solid by default (still warns mappers, avoids...

diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg
index 668d10484b461c3503188e346606b2827482fdba..683a96e02cf9ec442f1a48f3f3658d9b1e8b57e0 100644 (file)
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -13,7 +13,6 @@ g_balance_kill_antispam 0
 g_forced_respawn 1
 // g_playerclip_collisions 0 // do not check playerclips
 g_powerups 0
-g_spawnpoints_auto_move_out_of_solid 1
 g_start_delay 3
 g_use_ammunition 0
 g_weapon_stay 1

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index d4a97d7da54f872b631665fe9c0fad750faf00c2..664ec70020b3093c170242db862f668e4c879f6d 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -205,7 +205,7 @@ set g_pickup_respawntime_scaling_linear 1 "Multiply respawn time by `reciprocal
 set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\", \"most\", \"all_available\" or \"most_available\" (available only gives the weapon if the map normally has it as a pickup item)"
 set g_weaponarena_random "0" "if set to a number, only that weapon count is given on every spawn (randomly)"
 set g_weaponarena_random_with_blaster "1" "additionally, always provide the blaster in random weapon arena games"
-set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
+set g_spawnpoints_auto_move_out_of_solid 1 "show a warning if a spawn point was placed inside a solid, disabling this setting causes such spawn points to be removed and produce a more verbose error message"
 set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
 set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
 set g_fullbrightitems 0 "disables lighting effects on items, making them appear bright for visibility"