Spawn Crylink and cell ammo in place of Q3TA nailgun and ammo_nails

diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc
index c80da0af3772cf40ddd744cf1c471f0268702e23..93d935e020cdb6deca58134e1f0d791dc0f39f0d 100644 (file)
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@ -7,7 +7,7 @@
 //***********************
 //QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 //***********************
-SPAWNFUNC_WEAPON(weapon_nailgun, WEP_ELECTRO)
+// see: quake3.qc for weapon_nailgun
 SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR)
 SPAWNFUNC_WEAPON(weapon_supershotgun, WEP_MACHINEGUN)
 

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index e062b8db2df2b335c66687fdb4a70f4649fde0a5..bf0a8beeb944f7f658d07f20c2f18c7cd8c520fd 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -26,18 +26,19 @@ SPAWNFUNC_ITEM(ammo_bullets, ITEM_Bullets)
 // GL -> Mortar
 SPAWNFUNC_ITEM(ammo_grenades, ITEM_Rockets)
 
-// Mines -> Rockets
+// Team Arena Proximity Launcher -> Mine Layer
 SPAWNFUNC_WEAPON(weapon_prox_launcher, WEP_MINE_LAYER)
 SPAWNFUNC_ITEM(ammo_mines, ITEM_Rockets)
 
-// Q3TA chaingun -> HLAC
+// Team Arena Chaingun -> HLAC
 SPAWNFUNC_WEAPON(weapon_chaingun, WEP_HLAC)
 SPAWNFUNC_ITEM(ammo_belt, ITEM_Cells)
 
-// Q3TA nails -> cells
+// Team Arena Nailgun -> Crylink || Quake Nailgun -> Electro
+SPAWNFUNC_WEAPON_COND(weapon_nailgun, autocvar_sv_q3acompat_machineshotgunswap, WEP_CRYLINK, WEP_ELECTRO)
 SPAWNFUNC_ITEM(ammo_nails, ITEM_Cells)
 
-// LG -> Lightning
+// LG -> Electro
 SPAWNFUNC_WEAPON(weapon_lightning, WEP_ELECTRO)
 SPAWNFUNC_ITEM(ammo_lightning, ITEM_Cells)