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;fp=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=4ba441be9df4ae898f1624cbd912048da8ae1909;hp=7462de81f2a03a37cccab8794fee8e884f6fec79;hb=57659ff7226cfc4411d212a5aa1875effbf7d4e1;hpb=700861789922294ffa4b654a6683be45993240d1

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 7462de81f2..4ba441be9d 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -37,9 +37,9 @@ REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !cvar("g_instagib") &
 		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";
 	}
 
 	MUTATOR_ONREMOVE
@@ -120,53 +120,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);
@@ -274,7 +227,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); }
@@ -304,3 +257,4 @@ MUTATOR_HOOKFUNCTION(ok, SetModname)
 	M_ARGV(0, string) = "Overkill";
 	return true;
 }
+