Don't play teleportation sounds on dead players

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

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index ed824bd04c091168aa28802f9b8135531c9c4e60..fa0818283aa55273a42b60e7bbd215e75d856b99 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -1,46 +1,43 @@
 #include "player.qh"
 
-#include <common/effects/all.qh>
-#include "bot/api.qh"
-#include "cheats.qh"
-#include "client.qh"
-#include "clientkill.qh"
-#include "damage.qh"
-#include <server/mutators/_mod.qh>
-#include "world.qh"
-#include "handicap.qh"
-#include "portals.qh"
-#include "teamplay.qh"
-#include <server/main.qh>
-#include "weapons/common.qh"
-#include "weapons/throwing.qh"
-#include "command/common.qh"
-#include "command/vote.qh"
-#include <common/state.qh>
 #include <common/anim.qh>
 #include <common/animdecide.qh>
+#include <common/animdecide.qh>
 #include <common/csqcmodel_settings.qh>
-#include <common/gamemodes/sv_rules.qh>
 #include <common/deathtypes/all.qh>
+#include <common/effects/all.qh>
+#include <common/effects/qc/_mod.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/gamemodes/sv_rules.qh>
+#include <common/mapobjects/_mod.qh>
 #include <common/mapobjects/subs.qh>
 #include <common/mapobjects/teleporters.qh>
-#include <common/playerstats.qh>
-#include <lib/csqcmodel/sv_model.qh>
-
 #include <common/minigames/sv_minigames.qh>
-
-#include <common/gamemodes/_mod.qh>
-
-#include <common/physics/player.qh>
-#include <common/effects/qc/_mod.qh>
 #include <common/mutators/mutator/waypoints/waypointsprites.qh>
-#include <common/mapobjects/_mod.qh>
+#include <common/physics/player.qh>
+#include <common/playerstats.qh>
+#include <common/state.qh>
 #include <common/wepent.qh>
-
-#include "weapons/weaponstats.qh"
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/bot/api.qh>
+#include <server/cheats.qh>
+#include <server/client.qh>
+#include <server/clientkill.qh>
+#include <server/command/common.qh>
+#include <server/command/vote.qh>
+#include <server/damage.qh>
+#include <server/handicap.qh>
+#include <server/hook.qh>
+#include <server/main.qh>
+#include <server/mutators/_mod.qh>
+#include <server/portals.qh>
+#include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/weaponstats.qh>
 #include <server/weapons/weaponsystem.qh>
-
-#include <common/animdecide.qh>
+#include <server/world.qh>
 
 void Drop_Special_Items(entity player)
 {
@@ -554,6 +551,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
                UNSET_ONGROUND(this);
                // dying animation
                this.deadflag = DEAD_DYING;
+               // don't play teleportation sounds
+               this.teleportable = TELEPORT_SIMPLE;
 
                STAT(MOVEVARS_SPECIALCOMMAND, this) = false; // sweet release