Remove .move_* fields and MOVETYPE_PUSH logic (doesn't work)

[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 2deab23d76309f527b3e0f535ead32d92e61efb2..61104af4d6dce309924b59e4606f8dcd3434ea31 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -103,9 +103,7 @@ 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, attacker, targ, f))
-       {
                f = M_ARGV(2, float);
-       }
 
        attacker.totalfrags += f;
 
@@ -125,7 +123,7 @@ string AppendItemcodes(string s, entity player)
                s = strcat(s, "S");
        if(time < player.invincible_finished)
                s = strcat(s, "I");
-       if(player.flagcarried != world)
+       if(player.flagcarried != NULL)
                s = strcat(s, "F");
        if(PHYS_INPUT_BUTTON_CHAT(player))
                s = strcat(s, "T");
@@ -346,7 +344,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 
                        Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
                        Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
-                       Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount);
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount);
 
                        // In this case, the death message will ALWAYS be "foo was betrayed by bar"
                        // No need for specific death/weapon messages...
@@ -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;
@@ -541,7 +539,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
        targ.iceblock = ice;
        targ.revival_time = 0;
 
-       WITHSELF(ice, Ice_Think(ice));
+       Ice_Think(ice);
 
        RemoveGrapplingHook(targ);
 
@@ -549,12 +547,11 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 
        // add waypoint
        if(show_waypoint)
-               WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT);
+               WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', NULL, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT);
 }
 
 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);
 
@@ -573,7 +570,7 @@ void Unfreeze (entity targ)
        // remove the ice block
        if(targ.iceblock)
                remove(targ.iceblock);
-       targ.iceblock = world;
+       targ.iceblock = NULL;
 }
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
@@ -711,7 +708,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
                                Unfreeze(targ);
                                targ.health = autocvar_g_frozen_revive_falldamage_health;
                                Send_Effect(EFFECT_ICEORGLASS, targ.origin, '0 0 0', 3);
-                               Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname);
+                               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname);
                                Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF);
                        }
 
@@ -744,7 +741,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
                                targ.oldvelocity = targ.velocity;
 
                                targ.spawnorigin = spot.origin;
-                               setorigin (targ, spot.origin + '0 0 1' * (1 - targ.mins.z - 24));
+                               setorigin(targ, spot.origin + '0 0 1' * (1 - targ.mins.z - 24));
                                // don't reset back to last position, even if new position is stuck in solid
                                targ.oldorigin = targ.origin;
                                targ.prevorigin = targ.origin;
@@ -855,10 +852,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
                else
                {
                        targ.velocity = targ.velocity + farce;
-                       targ.move_velocity = targ.velocity;
                }
                UNSET_ONGROUND(targ);
-               targ.move_flags &= ~FL_ONGROUND;
                UpdateCSQCProjectile(targ);
        }
        // apply damage
@@ -906,7 +901,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
                if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
                {
                        force = inflictorvelocity;
-                       if(vlen(force) == 0)
+                       if(force == '0 0 0')
                                force = '0 0 -1';
                        else
                                force = normalize(force);
@@ -1254,18 +1249,18 @@ void Fire_ApplyEffect(entity e)
 void fireburner_think(entity this)
 {
        // for players, this is done in the regular loop
-       if(wasfreed(self.owner))
+       if(wasfreed(this.owner))
        {
-               remove(self);
+               remove(this);
                return;
        }
-       Fire_ApplyEffect(self.owner);
-       if(!Fire_IsBurning(self.owner))
+       Fire_ApplyEffect(this.owner);
+       if(!Fire_IsBurning(this.owner))
        {
-               self.owner.fire_burner = world;
-               remove(self);
+               this.owner.fire_burner = NULL;
+               remove(this);
                return;
        }
-       Fire_ApplyDamage(self.owner);
-       self.nextthink = time;
+       Fire_ApplyDamage(this.owner);
+       this.nextthink = time;
 }