From: Lyberta <lyberta@lyberta.net>
Date: Sat, 11 Mar 2017 13:44:06 +0000 (+0300)
Subject: Use standalone weapons in overkill mutator.
X-Git-Tag: xonotic-v0.8.5~2119^2~86
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6072227e8fbce05c965c025d0cc44f322c612d86;p=xonotic%2Fxonotic-data.pk3dir.git

Use standalone weapons in overkill mutator.
---

diff --git a/qcsrc/common/mutators/mutator/overkill/cl_overkill.qc b/qcsrc/common/mutators/mutator/overkill/cl_overkill.qc
index eb2195395..4f4011b05 100644
--- a/qcsrc/common/mutators/mutator/overkill/cl_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/cl_overkill.qc
@@ -4,8 +4,8 @@ REGISTER_MUTATOR(ok, false)
 {
 	MUTATOR_ONADD {
 		cvar_settemp("g_overkill", "1");
-		WEP_SHOTGUN.mdl = "ok_shotgun";
-		WEP_MACHINEGUN.mdl = "ok_mg";
-		WEP_VORTEX.mdl = "ok_sniper";
+		//WEP_SHOTGUN.mdl = "ok_shotgun";
+		//WEP_MACHINEGUN.mdl = "ok_mg";
+		//WEP_VORTEX.mdl = "ok_sniper";
 	}
 }
diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 5d938f3fd..b36bae733 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -243,7 +243,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 
 MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 {
-	WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));
+	WepSet ok_start_items = (WEPSET(OVERKILL_MACHINEGUN) | WEPSET(OVERKILL_VORTEX) | WEPSET(OVERKILL_SHOTGUN));
 
 	if(WEP_RPC.weaponstart > 0) { ok_start_items |= WEPSET(RPC); }
 	if(WEP_HMG.weaponstart > 0) { ok_start_items |= WEPSET(HMG); }
@@ -292,7 +292,7 @@ void ok_Initialize()
 	WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 	WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 
-	WEP_SHOTGUN.mdl = "ok_shotgun";
-	WEP_MACHINEGUN.mdl = "ok_mg";
-	WEP_VORTEX.mdl = "ok_sniper";
+	//WEP_SHOTGUN.mdl = "ok_shotgun";
+	//WEP_MACHINEGUN.mdl = "ok_mg";
+	//WEP_VORTEX.mdl = "ok_sniper";
 }