Merge branch 'post-0.8.2' into 'develop'

Remove legacy 0.8.1 workarounds

See merge request xonotic/xonotic-data.pk3dir!457

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 2725b8f441804949f5df2b22091cda583f43c679..6ce163fa77a437e9211ed3f6fc9a6c9c2aa24496 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -305,14 +305,11 @@ WepSet WEPSET_SUPERWEAPONS;
 
 #include "all.inc"
 
-// TODO: remove after 0.8.2. Retains impulse number compatibility because 0.8.1 clients don't reload the weapons.cfg
-#define WEP_HARDCODED_IMPULSES 20
-
 // TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
 #define WEP_IMPULSE_BEGIN 230
 #define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (REGISTRY_COUNT(Weapons) - 1) - 1, 253)
 
-REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
+REGISTRY_SORT(Weapons, 1)
 REGISTRY_CHECK(Weapons)
 
 STATIC_INIT(register_weapons_done)

diff --git a/weapons.cfg b/weapons.cfg
deleted file mode 100644 (file)
index 760337d..0000000
--- a/weapons.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-alias weapon_blaster "impulse 230"
-alias weapon_shotgun "impulse 231"
-alias weapon_machinegun "impulse 232"
-alias weapon_mortar "impulse 233"
-alias weapon_minelayer "impulse 234"
-alias weapon_electro "impulse 235"
-alias weapon_crylink "impulse 236"
-alias weapon_vortex "impulse 237"
-alias weapon_hagar "impulse 238"
-alias weapon_devastator "impulse 239"
-alias weapon_porto "impulse 240"
-alias weapon_vaporizer "impulse 241"
-alias weapon_hook "impulse 242"
-alias weapon_hlac "impulse 243"
-alias weapon_tuba "impulse 244"
-alias weapon_rifle "impulse 245"
-alias weapon_fireball "impulse 246"
-alias weapon_seeker "impulse 247"
-alias weapon_shockwave "impulse 248"
-alias weapon_arc "impulse 249"

diff --git a/weapons.cfg.sh b/weapons.cfg.sh
deleted file mode 100755 (executable)
index f02d43c..0000000
--- a/weapons.cfg.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-<qcsrc/server/w_all.qc perl -ne 'BEGIN{$i=230}/w_(.*?)\./ or+next;printf qq{alias weapon_%s "impulse %d"\n},$1,$i++;'

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 653015363c1c7dce069df8eac6ac3fe9ff76ca13..ecb7e023eaa00830a275362edf8f17cd79b691e3 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -379,8 +379,6 @@ alias weapon_group_7 "impulse 7"
 alias weapon_group_8 "impulse 8"
 alias weapon_group_9 "impulse 9"
 alias weapon_group_0 "impulse 14" // cycles the superweapons
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-exec weapons.cfg
 
 cl_curl_enabled 1
 cl_curl_maxdownloads 3