Offhand: fix machinegun (still needs .clip_load > 0)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_overkill.qc

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 9247dffacaf1317ab1fbccb4157fdaa9de7fbf89..69c9fffd793116502e0127cf7be6679ad5c62172 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -64,15 +64,14 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Calculate)
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerDamage_SplitHealthArmor)
-{
+{SELFPARAM();
        if(damage_take)
                self.ok_pauseregen_finished = max(self.ok_pauseregen_finished, time + 2);
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerDies)
-{
-       entity oldself = self;
+{SELFPARAM();
        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;
 
@@ -101,7 +100,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerRegen)
-{
+{SELFPARAM();
        // overkill's values are different, so use custom regen
        if(!self.frozen)
        {
@@ -125,7 +124,7 @@ MUTATOR_HOOKFUNCTION(ok_ForbidThrowCurrentWeapon)
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
-{
+{SELFPARAM();
        if(intermission_running || gameover)
                return false;
 
@@ -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;
        }
@@ -189,7 +189,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
-{
+{SELFPARAM();
        if(autocvar_g_overkill_ammo_charge)
        {
                for(int i = WEP_FIRST; i <= WEP_LAST; ++i)
@@ -207,7 +207,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
-{
+{SELFPARAM();
        if(autocvar_g_powerups)
        if(autocvar_g_overkill_powerups_replace)
        {
@@ -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;
@@ -250,7 +250,7 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(ok_ItemRemove)
-{
+{SELFPARAM();
        if(self.ok_item)
                return false;
 
@@ -264,7 +264,7 @@ MUTATOR_HOOKFUNCTION(ok_ItemRemove)
 }
 
 MUTATOR_HOOKFUNCTION(ok_SpectateCopy)
-{
+{SELFPARAM();
        self.ammo_charge[self.weapon] = other.ammo_charge[other.weapon];
        self.ok_use_ammocharge = other.ok_use_ammocharge;
 
@@ -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);