X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_overkill.qc;h=69c9fffd793116502e0127cf7be6679ad5c62172;hp=5410d6cd0580114df9bd05be9bb10f3987a62118;hb=047e80d3190ef626c6029a655677ff1a08e66e3a;hpb=5b22584122d4354ab7819853d0fa5219d14d832e

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 5410d6cd05..69c9fffd79 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -72,7 +72,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDamage_SplitHealthArmor)
 
 MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 {SELFPARAM();
-	entity oldself = self;
 	entity targ = ((frag_attacker) ? frag_attacker : frag_target);
 
 	if(IS_MONSTER(self))
@@ -81,7 +80,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 		other = world;
 	}
 
-	self = spawn();
+	setself(spawn());
 	self.ok_item = true;
 	self.noalign = true;
 	self.pickup_anyway = true;
@@ -93,7 +92,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 	self.velocity = '0 0 200' + normalize(targ.origin - self.origin) * 500;
 	self.classname = "droppedweapon"; // hax
 	SUB_SetFade(self, time + 5, 1);
-	self = oldself;
+	setself(this);
 
 	self.ok_lastwep = self.switchweapon;
 
@@ -175,10 +174,11 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 		{
 			//Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_OVERKILL_CHARGE);
 			self.ok_notice_time = time + 2;
-			play2(self, W_Sound("dryfire"));
+			play2(self, SND(DRYFIRE));
 		}
+		Weapon wpn = get_weaponinfo(self.weapon);
 		if(self.weaponentity.state != WS_CLEAR)
-			w_ready();
+			w_ready(wpn, self.BUTTON_ATCK, self.BUTTON_ATCK2);
 
 		self.weapon_blocked = true;
 	}
@@ -215,7 +215,7 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 		{
 			entity wep = spawn();
 			setorigin(wep, self.origin);
-			setmodel(wep, W_Model("g_ok_hmg.md3"));
+			setmodel(wep, MDL_OK_HMG);
 			wep.classname = "weapon_hmg";
 			wep.ok_item = true;
 			wep.noalign = self.noalign;
@@ -232,7 +232,7 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 		{
 			entity wep = spawn();
 			setorigin(wep, self.origin);
-			setmodel(wep, W_Model("g_ok_rl.md3"));
+			setmodel(wep, MDL_OK_RPC);
 			wep.classname = "weapon_rpc";
 			wep.ok_item = true;
 			wep.noalign = self.noalign;
@@ -317,20 +317,6 @@ void ok_Initialize()
 
 	precache_all_playermodels("models/ok_player/*.dpm");
 
-	precache_model(W_Model("h_ok_mg.iqm"));
-	precache_model(W_Model("v_ok_mg.md3"));
-	precache_model(W_Model("g_ok_mg.md3"));
-
-	precache_model(W_Model("h_ok_shotgun.iqm"));
-	precache_model(W_Model("v_ok_shotgun.md3"));
-	precache_model(W_Model("g_ok_shotgun.md3"));
-
-	precache_model(W_Model("h_ok_sniper.iqm"));
-	precache_model(W_Model("v_ok_sniper.md3"));
-	precache_model(W_Model("g_ok_sniper.md3"));
-
-	precache_sound(W_Sound("dryfire"));
-
 	addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
 	addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);