]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/PlayerDied' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 22:56:54 +0000 (22:56 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 22:56:54 +0000 (22:56 +0000)
Added PlayerDied event.

See merge request !427

qcsrc/server/mutators/events.qh
qcsrc/server/player.qc

index 8624d26bfa99565a491cc5b40eb1c63e94277cf2..f186dd73bdd094c52ee113cfdd17b1f694ef412e 100644 (file)
@@ -69,6 +69,12 @@ MUTATOR_HOOKABLE(ClientDisconnect, EV_ClientDisconnect);
     /**/
 MUTATOR_HOOKABLE(PlayerDies, EV_PlayerDies);
 
+/** called after a player died. */
+#define EV_PlayerDied(i, o) \
+    /** player                 */ i(entity, MUTATOR_ARGV_0_entity) \
+    /**/
+MUTATOR_HOOKABLE(PlayerDied, EV_PlayerDied);
+
 /** allows overriding the frag centerprint messages */
 #define EV_FragCenterMessage(i, o) \
     /** attacker       */ i(entity, MUTATOR_ARGV_0_entity) \
index 2658c1830d34bca314d8c0dfe90ff465cbac6524..f22ff0daf8f5d1617fcda9cb121e96466c475857 100644 (file)
@@ -658,6 +658,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
                                ATTACK_FINISHED_FOR(this, it.m_id, slot) = 0;
                        }
                ));
+               MUTATOR_CALLHOOK(PlayerDied, this);
        }
 }