Remove unnecessary returns

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

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 730dad620b2d8818eec2ad8ba7a8bd00eeebd504..beaf7805a28f5d3f9778707fc9996fc031455ffe 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -31,7 +31,7 @@ void UpdateFrags(entity player, float f)
 }
 
 void GiveFrags (entity attacker, entity targ, float f, int deathtype)
-{SELFPARAM();
+{
        // TODO route through PlayerScores instead
        if(gameover) return;
 
@@ -102,10 +102,8 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype)
        }
 
        // FIXME fix the mess this is (we have REAL points now!)
-       if(MUTATOR_CALLHOOK(GiveFragsForKill, self, attacker, targ, f))
-       {
-               f = frag_score;
-       }
+       if(MUTATOR_CALLHOOK(GiveFragsForKill, attacker, targ, f))
+               f = M_ARGV(2, float);
 
        attacker.totalfrags += f;
 
@@ -503,17 +501,17 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 
 void Ice_Think(entity this)
 {
-       if(!STAT(FROZEN, self.owner) || self.owner.iceblock != self)
+       if(!STAT(FROZEN, this.owner) || this.owner.iceblock != this)
        {
-               remove(self);
+               remove(this);
                return;
        }
-       setorigin(self, self.owner.origin - '0 0 16');
-       self.nextthink = time;
+       setorigin(this, this.owner.origin - '0 0 16');
+       this.nextthink = time;
 }
 
 void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint)
-{SELFPARAM();
+{
        if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed
                return;
 
@@ -526,7 +524,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
        targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
        targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
        targ.revive_speed = freeze_time;
-       self.bot_attack = false;
+       targ.bot_attack = false;
 
        entity ice = new(ice);
        ice.owner = targ;
@@ -554,7 +552,6 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 
 void Unfreeze (entity targ)
 {
-    SELFPARAM();
        if(!STAT(FROZEN, targ))
                return;
 
@@ -564,7 +561,7 @@ void Unfreeze (entity targ)
        STAT(FROZEN, targ) = 0;
        targ.revive_progress = 0;
        targ.revival_time = time;
-       self.bot_attack = true;
+       targ.bot_attack = true;
 
        WaypointSprite_Kill(targ.waypointsprite_attached);
 
@@ -612,7 +609,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
        {
                // exit the vehicle before killing (fixes a crash)
                if(IS_PLAYER(targ) && targ.vehicle)
-                       WITHSELF(targ, vehicles_exit(VHEF_RELEASE));
+                       vehicles_exit(targ.vehicle, VHEF_RELEASE);
 
                // These are ALWAYS lethal
                // No damage modification here
@@ -697,9 +694,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 
                // should this be changed at all? If so, in what way?
                MUTATOR_CALLHOOK(PlayerDamage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force);
-               damage = frag_damage;
-               mirrordamage = frag_mirrordamage;
-               force = frag_force;
+               damage = M_ARGV(4, float);
+               mirrordamage = M_ARGV(5, float);
+               force = M_ARGV(6, vector);
 
                if(STAT(FROZEN, targ))
                if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id)