From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 26 Sep 2020 10:39:08 +0000 (+1000)
Subject: Merge branch 'master' into bones_was_here/q3compat
X-Git-Tag: xonotic-v0.8.5~352^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b508390bc38d446e441ec990a1d34851251bd2cb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into bones_was_here/q3compat
---

b508390bc38d446e441ec990a1d34851251bd2cb
diff --cc qcsrc/server/compat/quake.qc
index 0d1e8a6e9,23ae923b0..8c227f9be
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@@ -2,16 -2,12 +2,15 @@@
  
  #include <common/weapons/_all.qh>
  #include <common/stats.qh>
- #include <server/miscfunctions.qh>
  #include <common/weapons/_all.qh>
  
 -//***********************
 -//QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 -//***********************
 -SPAWNFUNC_WEAPON(weapon_nailgun, WEP_ELECTRO)
 +/***********************
 + * QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 + ***********************
 + weapon_nailgun handled in quake3.qc
 + item_armor1 handled in items.qc
 +*/
 +
  SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR)
  SPAWNFUNC_WEAPON(weapon_supershotgun, WEP_MACHINEGUN)