X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=0c698e6b0dd3d29ef67fdb1c922a82ed94286856;hp=d2a7308dedf04267af31ea7b599a4abd447ca08f;hb=6ea97246f03651c514be506bf57cbc0c2351e935;hpb=2c2a008a2c1b25d47a81f5d7836a510d4643273a

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index d2a7308ded..0c698e6b0d 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -110,53 +110,6 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon)
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
-{
-	if(game_stopped)
-		return;
-
-	entity player = M_ARGV(0, entity);
-
-	if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player))
-		return;
-
-	if(PHYS_INPUT_BUTTON_ATCK2(player) && time >= player.jump_interval)
-	if( !forbidWeaponUse(player)
-		|| (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
-	{
-		player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);
-		makevectors(player.v_angle);
-
-		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-		{
-			.entity weaponentity = weaponentities[slot];
-
-			if(player.(weaponentity).m_weapon == WEP_Null && slot != 0)
-				continue;
-
-			Weapon oldwep = player.(weaponentity).m_weapon;
-			player.(weaponentity).m_weapon = WEP_BLASTER;
-			W_Blaster_Attack(
-				player,
-				weaponentity,
-				WEP_BLASTER.m_id | HITTYPE_SECONDARY,
-				WEP_CVAR_SEC(vaporizer, shotangle),
-				WEP_CVAR_SEC(vaporizer, damage),
-				WEP_CVAR_SEC(vaporizer, edgedamage),
-				WEP_CVAR_SEC(vaporizer, radius),
-				WEP_CVAR_SEC(vaporizer, force),
-				WEP_CVAR_SEC(vaporizer, speed),
-				WEP_CVAR_SEC(vaporizer, spread),
-				WEP_CVAR_SEC(vaporizer, delay),
-				WEP_CVAR_SEC(vaporizer, lifetime)
-			);
-			player.(weaponentity).m_weapon = oldwep;
-		}
-	}
-
-	PHYS_INPUT_BUTTON_ATCK2(player) = false;
-}
-
 MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
 {
 	entity player = M_ARGV(0, entity);
@@ -272,7 +225,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); }
@@ -310,7 +263,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";
 }