MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo)
{
- entity actor = MUTATOR_ARGV(0, entity);
+ entity actor = M_ARGV(0, entity);
if (actor.ok_use_ammocharge)
{
ok_DecreaseCharge(actor, PS(actor).m_weapon.m_id);
MUTATOR_HOOKFUNCTION(ok, W_Reload)
{
- entity actor = MUTATOR_ARGV(0, entity);
+ entity actor = M_ARGV(0, entity);
return actor.ok_use_ammocharge;
}
MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
{
+ entity frag_attacker = M_ARGV(1, entity);
+ entity frag_target = M_ARGV(2, entity);
+ float frag_deathtype = M_ARGV(3, float);
+ float frag_damage = M_ARGV(4, float);
+ vector frag_force = M_ARGV(6, vector);
+
if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
{
Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE);
frag_force = '0 0 0';
}
+
+ M_ARGV(4, float) = frag_damage;
+ M_ARGV(6, vector) = frag_force;
}
return false;
MUTATOR_HOOKFUNCTION(ok, PlayerDamage_SplitHealthArmor)
{
+ entity frag_target = M_ARGV(2, entity);
+ float damage_take = M_ARGV(4, float);
+
if(damage_take)
frag_target.ok_pauseregen_finished = max(frag_target.ok_pauseregen_finished, time + 2);
- return false;
}
-MUTATOR_HOOKFUNCTION(ok, PlayerDies)
+void ok_DropItem(entity this, entity targ)
{
- entity targ = ((frag_attacker) ? frag_attacker : frag_target);
-
- if(IS_MONSTER(frag_target))
- {
- remove(other); // remove default item
- other = NULL;
- }
-
entity e = new(droppedweapon); // hax
e.ok_item = true;
e.noalign = true;
e.pickup_anyway = true;
e.spawnfunc_checked = true;
- spawnfunc_item_armor_small(e);
+ WITHSELF(e, spawnfunc_item_armor_small(e));
if (!wasfreed(e)) { // might have been blocked by a mutator
e.movetype = MOVETYPE_TOSS;
e.gravity = 1;
e.reset = SUB_Remove;
- setorigin(e, frag_target.origin + '0 0 32');
- e.velocity = '0 0 200' + normalize(targ.origin - frag_target.origin) * 500;
+ setorigin(e, this.origin + '0 0 32');
+ e.velocity = '0 0 200' + normalize(targ.origin - this.origin) * 500;
SUB_SetFade(e, time + 5, 1);
}
+}
+
+MUTATOR_HOOKFUNCTION(ok, PlayerDies)
+{
+ entity frag_attacker = M_ARGV(1, entity);
+ entity frag_target = M_ARGV(2, entity);
+
+ entity targ = ((frag_attacker) ? frag_attacker : frag_target);
+
+ ok_DropItem(frag_target, targ);
frag_target.ok_lastwep = PS(frag_target).m_switchweapon.m_id;
+}
- return false;
+MUTATOR_HOOKFUNCTION(ok, MonsterDropItem)
+{
+ entity mon = M_ARGV(0, entity);
+ entity olditem = M_ARGV(1, entity);
+ entity frag_attacker = M_ARGV(2, entity);
+
+ remove(olditem);
+
+ M_ARGV(1, entity) = NULL;
+
+ ok_DropItem(mon, frag_attacker);
}
-MUTATOR_HOOKFUNCTION(ok, MonsterDropItem) { ok_PlayerDies(); }
MUTATOR_HOOKFUNCTION(ok, PlayerRegen)
{SELFPARAM();
if(!forbidWeaponUse(self) || self.weapon_blocked) // allow if weapon is blocked
if(time >= self.jump_interval)
{
- self.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor();
+ self.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(this);
makevectors(self.v_angle);
Weapon oldwep = PS(self).m_weapon;
}
MUTATOR_HOOKFUNCTION(ok, PlayerSpawn)
-{SELFPARAM();
+{
+ entity player = M_ARGV(0, entity);
+
if(autocvar_g_overkill_ammo_charge)
{
- FOREACH(Weapons, it != WEP_Null, LAMBDA(self.ammo_charge[it.m_id] = autocvar_g_overkill_ammo_charge_limit));
+ FOREACH(Weapons, it != WEP_Null, LAMBDA(player.ammo_charge[it.m_id] = autocvar_g_overkill_ammo_charge_limit));
- self.ok_use_ammocharge = 1;
- self.ok_notice_time = time;
+ player.ok_use_ammocharge = 1;
+ player.ok_notice_time = time;
}
else
- self.ok_use_ammocharge = 0;
+ player.ok_use_ammocharge = 0;
// if player changed their weapon while dead, don't switch to their death weapon
- if(self.impulse)
- self.ok_lastwep = 0;
+ if(player.impulse)
+ player.ok_lastwep = 0;
- self.ok_pauseregen_finished = time + 2;
+ player.ok_pauseregen_finished = time + 2;
return false;
}
void self_spawnfunc_weapon_rpc(entity this) { spawnfunc_weapon_rpc(this); }
MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn)
-{SELFPARAM();
+{
+ entity ent = M_ARGV(0, entity);
+
if(autocvar_g_powerups)
if(autocvar_g_overkill_powerups_replace)
{
- if(self.classname == "item_strength")
+ if(ent.classname == "item_strength")
{
entity wep = new(weapon_hmg);
- setorigin(wep, self.origin);
+ setorigin(wep, ent.origin);
setmodel(wep, MDL_OK_HMG);
wep.ok_item = true;
- wep.noalign = self.noalign;
- wep.cnt = self.cnt;
- wep.team = self.team;
+ wep.noalign = ent.noalign;
+ wep.cnt = ent.cnt;
+ wep.team = ent.team;
wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
wep.pickup_anyway = true;
wep.spawnfunc_checked = true;
return true;
}
- if(self.classname == "item_invincible")
+ if(ent.classname == "item_invincible")
{
entity wep = new(weapon_rpc);
- setorigin(wep, self.origin);
+ setorigin(wep, ent.origin);
setmodel(wep, MDL_OK_RPC);
wep.ok_item = true;
- wep.noalign = self.noalign;
- wep.cnt = self.cnt;
- wep.team = self.team;
+ wep.noalign = ent.noalign;
+ wep.cnt = ent.cnt;
+ wep.team = ent.team;
wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
wep.pickup_anyway = true;
wep.spawnfunc_checked = true;
}
MUTATOR_HOOKFUNCTION(ok, FilterItem)
-{SELFPARAM();
- if(self.ok_item)
+{
+ entity item = M_ARGV(0, entity);
+
+ if(item.ok_item)
return false;
- switch(self.items)
+ switch(item.items)
{
case ITEM_HealthMega.m_itemid: return !(autocvar_g_overkill_100h_anyway);
case ITEM_ArmorMega.m_itemid: return !(autocvar_g_overkill_100a_anyway);
}
MUTATOR_HOOKFUNCTION(ok, SpectateCopy)
-{SELFPARAM();
- self.ammo_charge[PS(self).m_weapon.m_id] = other.ammo_charge[PS(other).m_weapon.m_id];
- self.ok_use_ammocharge = other.ok_use_ammocharge;
+{
+ entity spectatee = M_ARGV(0, entity);
+ entity client = M_ARGV(1, entity);
- return false;
+ client.ammo_charge[PS(client).m_weapon.m_id] = spectatee.ammo_charge[PS(spectatee).m_weapon.m_id];
+ client.ok_use_ammocharge = spectatee.ok_use_ammocharge;
}
MUTATOR_HOOKFUNCTION(ok, SetStartItems)
MUTATOR_HOOKFUNCTION(ok, BuildMutatorsString)
{
- ret_string = strcat(ret_string, ":OK");
- return false;
+ M_ARGV(0, string) = strcat(M_ARGV(0, string), ":OK");
}
MUTATOR_HOOKFUNCTION(ok, BuildMutatorsPrettyString)
{
- ret_string = strcat(ret_string, ", Overkill");
- return false;
+ M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Overkill");
}
MUTATOR_HOOKFUNCTION(ok, SetModname)
{
- modname = "Overkill";
+ M_ARGV(0, string) = "Overkill";
return true;
}