X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=61b5add2bbd3b0e9a5bb47109add2f574cb62df6;hb=c092ab283a53142d3c9658bab30ec38e21e44f8c;hp=8425308ac7fe32af1c0f6604cb8617569be1030a;hpb=dd26dcda7539f07aae99ec9f6a7c407c7ce43ea6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 8425308ac..61b5add2b 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -128,7 +128,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) culprit = DEATH_WEAPONOF(deathtype); if(!culprit) culprit = attacker.weapon; - else if(!WEPSET_CONTAINS_EW(attacker, culprit)) + else if(!(attacker.weapons & WepSet_FromWeapon(culprit))) culprit = attacker.weapon; if(g_weaponarena_random_with_laser && culprit == WEP_LASER) @@ -144,26 +144,26 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) } if(inWarmupStage) - WEPSET_COPY_EA(GiveFrags_randomweapons, warmup_start_weapons); + GiveFrags_randomweapons.weapons = warmup_start_weapons; else - WEPSET_COPY_EA(GiveFrags_randomweapons, start_weapons); + GiveFrags_randomweapons.weapons = start_weapons; // all others (including the culprit): remove - WEPSET_ANDNOT_EE(GiveFrags_randomweapons, attacker); - WEPSET_ANDNOT_EW(GiveFrags_randomweapons, culprit); + GiveFrags_randomweapons.weapons &= ~attacker.weapons; + GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit); // among the remaining ones, choose one by random W_RandomWeapons(GiveFrags_randomweapons, 1); - if(!WEPSET_EMPTY_E(GiveFrags_randomweapons)) + if(GiveFrags_randomweapons.weapons) { - WEPSET_OR_EE(attacker, GiveFrags_randomweapons); - WEPSET_ANDNOT_EW(attacker, culprit); + attacker.weapons |= GiveFrags_randomweapons.weapons; + attacker.weapons &= ~WepSet_FromWeapon(culprit); } } // after a frag, choose another random weapon set - if not(WEPSET_CONTAINS_EW(attacker, attacker.weapon)) + if not(attacker.weapons & WepSet_FromWeapon(attacker.weapon)) W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker)); } @@ -569,7 +569,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage_attacker = attacker; attacker_save = attacker; - if(targ.classname == "player") + if(IS_PLAYER(targ)) if(targ.hook) if(targ.hook.aiment) if(targ.hook.aiment == attacker) @@ -578,7 +578,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // special rule: gravity bomb does not hit team mates (other than for disconnecting the hook) if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA)) { - if(targ.classname == "player") + if(IS_PLAYER(targ)) if not(IsDifferentTeam(targ, attacker)) { self = oldself; @@ -603,20 +603,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } else { - /* - skill based bot damage? gtfo. (tZork) - if (targ.classname == "player") - if (attacker.classname == "player") - if (!targ.isbot) - if (attacker.isbot) - damage = damage * bound(0.1, (skill + 5) * 0.1, 1); - */ - // nullify damage if teamplay is on if(deathtype != DEATH_TELEFRAG) - if(attacker.classname == "player") + if(IS_PLAYER(attacker)) { - if(targ.classname == "player" && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ))) + if(IS_PLAYER(targ) && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ))) { damage = 0; force = '0 0 0'; @@ -631,17 +622,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = 0; else if(autocvar_teamplay_mode == 4) { - if(targ.classname == "player" && targ.deadflag == DEAD_NO) + if(IS_PLAYER(targ) && targ.deadflag == DEAD_NO) { attacker.dmg_team = attacker.dmg_team + damage; complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold; - if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers? + if(complainteamdamage > 0) mirrordamage = autocvar_g_mirrordamage * complainteamdamage; mirrorforce = autocvar_g_mirrordamage * vlen(force); - if(g_ca) - damage = 0; - else - damage = autocvar_g_friendlyfire * damage; + damage = autocvar_g_friendlyfire * damage; // mirrordamage will be used LATER if(autocvar_g_mirrordamage_virtual) @@ -717,7 +705,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if (targ == attacker) { - if(g_ca || (g_cts && !autocvar_g_cts_selfdamage)) + if(g_cts && !autocvar_g_cts_selfdamage) damage = 0; else damage = damage * autocvar_g_balance_selfdamagepercent; // Partial damage if the attacker hits himself @@ -735,7 +723,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float else victim = targ; - if(victim.classname == "player" || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET) + if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET) { if(IsDifferentTeam(victim, attacker)) { @@ -754,7 +742,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if not(DEATH_ISSPECIAL(deathtype)) { - if(targ.classname == "player") // don't do this for vehicles + if(IS_PLAYER(targ)) // don't do this for vehicles if(IsFlying(victim)) yoda = 1; } @@ -781,7 +769,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // apply push if (self.damageforcescale) if (vlen(force)) - if (self.classname != "player" || time >= self.spawnshieldtime || g_midair) + if (!IS_PLAYER(self) || time >= self.spawnshieldtime) { vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor); if(self.movetype == MOVETYPE_PHYSICS) @@ -800,7 +788,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } else self.velocity = self.velocity + farce; - self.flags &~= FL_ONGROUND; + self.flags &= ~FL_ONGROUND; UpdateCSQCProjectile(self); } // apply damage @@ -934,7 +922,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e if(autocvar_g_throughfloor_debug) print(sprintf(" steps=%f", total)); - if (targ.classname == "player") + if (IS_PLAYER(targ)) total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player)); else total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other)); @@ -1070,7 +1058,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) float dps; float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime; - if(e.classname == "player") + if(IS_PLAYER(e)) { if(e.deadflag) return -1; @@ -1194,7 +1182,7 @@ void Fire_ApplyDamage(entity e) return; for(t = 0, o = e.owner; o.owner && t < 16; o = o.owner, ++t); - if(clienttype(o) == CLIENTTYPE_NOTACLIENT) + if(IS_NOT_A_CLIENT(o)) o = e.fire_owner; // water and slime stop fire @@ -1222,7 +1210,7 @@ void Fire_ApplyDamage(entity e) if not(IS_INDEPENDENT_PLAYER(e)) FOR_EACH_PLAYER(other) if(e != other) { - if(other.classname == "player") + if(IS_PLAYER(other)) if(other.deadflag == DEAD_NO) if not(IS_INDEPENDENT_PLAYER(other)) if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax)) @@ -1239,7 +1227,7 @@ void Fire_ApplyEffect(entity e) if(Fire_IsBurning(e)) e.effects |= EF_FLAME; else - e.effects &~= EF_FLAME; + e.effects &= ~EF_FLAME; } void fireburner_think()