Merge remote-tracking branch 'origin/master' into samual/weapons

[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 e3086dec89c1ae76a62f34e4bb11491ae76bbd33..2d25a0c2fe55e6555b7c692945163d1e5eb52d43 100644 (file)
--- 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)
@@ -143,27 +143,27 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
                                GiveFrags_randomweapons.classname = "GiveFrags_randomweapons";
                        }
 
-                       if(inWarmupStage)
-                               WEPSET_COPY_EA(GiveFrags_randomweapons, warmup_start_weapons);
+                       if(warmup_stage)
+                               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));
        }
 
@@ -247,7 +247,7 @@ void Obituary_SpecialDeath(
                {
                        if(deathent.death_msgmurder)
                        {
-                               Send_Notification_WOVA(
+                               Send_Notification_WOCOVA(
                                        NOTIF_ONE,
                                        notif_target,
                                        MSG_MULTI,
@@ -255,7 +255,7 @@ void Obituary_SpecialDeath(
                                        s1, s2, s3, "",
                                        f1, f2, f3, 0
                                );
-                               Send_Notification_WOVA(
+                               Send_Notification_WOCOVA(
                                        NOTIF_ALL_EXCEPT,
                                        notif_target,
                                        MSG_INFO,
@@ -269,7 +269,7 @@ void Obituary_SpecialDeath(
                {
                        if(deathent.death_msgself)
                        {
-                               Send_Notification_WOVA(
+                               Send_Notification_WOCOVA(
                                        NOTIF_ONE,
                                        notif_target,
                                        MSG_MULTI,
@@ -277,7 +277,7 @@ void Obituary_SpecialDeath(
                                        s1, s2, s3, "",
                                        f1, f2, f3, 0
                                );
-                               Send_Notification_WOVA(
+                               Send_Notification_WOCOVA(
                                        NOTIF_ALL_EXCEPT,
                                        notif_target,
                                        MSG_INFO,
@@ -308,7 +308,7 @@ float Obituary_WeaponDeath(
 
                if(death_message)
                {
-                       Send_Notification_WOVA(
+                       Send_Notification_WOCOVA(
                                NOTIF_ONE,
                                notif_target,
                                MSG_MULTI,
@@ -316,7 +316,7 @@ float Obituary_WeaponDeath(
                                s1, s2, s3, "",
                                f1, f2, 0, 0
                        );
-                       Send_Notification_WOVA(
+                       Send_Notification_WOCOVA(
                                NOTIF_ALL_EXCEPT,
                                notif_target,
                                MSG_INFO,
@@ -462,30 +462,51 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
                                kill_count_to_target = 0;
                        }
 
-                       float verbose_allowed = (autocvar_notification_server_allows_frag_verbose && ((autocvar_notification_server_allows_frag_verbose == 2) || inWarmupStage));
                        if(targ.istypefrag)
                        {
-                               if(attacker.FRAG_VERBOSE && verbose_allowed)
-                                       Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-                               else
-                                       Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG, targ.netname, kill_count_to_attacker);
-
-                               if(targ.FRAG_VERBOSE && verbose_allowed)
-                                       Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-                               else
-                                       Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED, attacker.netname, kill_count_to_target);
+                               Send_Notification(
+                                       NOTIF_ONE,
+                                       attacker,
+                                       MSG_CHOICE,
+                                       CHOICE_TYPEFRAG,
+                                       targ.netname,
+                                       kill_count_to_attacker,
+                                       (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+                               );
+                               Send_Notification(
+                                       NOTIF_ONE,
+                                       targ,
+                                       MSG_CHOICE,
+                                       CHOICE_TYPEFRAGGED,
+                                       attacker.netname,
+                                       kill_count_to_target,
+                                       attacker.health,
+                                       attacker.armorvalue,
+                                       (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+                               );
                        }
                        else
                        {
-                               if(attacker.FRAG_VERBOSE && verbose_allowed)
-                                       Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-                               else
-                                       Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG, targ.netname, kill_count_to_attacker);
-
-                               if(targ.FRAG_VERBOSE && verbose_allowed)
-                                       Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-                               else
-                                       Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED, attacker.netname, kill_count_to_target);
+                               Send_Notification(
+                                       NOTIF_ONE,
+                                       attacker,
+                                       MSG_CHOICE,
+                                       CHOICE_FRAG,
+                                       targ.netname,
+                                       kill_count_to_attacker,
+                                       (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+                               );
+                               Send_Notification(
+                                       NOTIF_ONE,
+                                       targ,
+                                       MSG_CHOICE,
+                                       CHOICE_FRAGGED,
+                                       attacker.netname,
+                                       kill_count_to_target,
+                                       attacker.health,
+                                       attacker.armorvalue,
+                                       (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+                               );
                        }
 
                        if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
@@ -788,7 +809,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
@@ -1185,7 +1206,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()