From c975a5639b65dd3ae8016c5be2bbd98ef4df3be3 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 8 Apr 2006 13:17:20 +0000 Subject: [PATCH] you now die of becoming too fast (please revert once the "entities falling through" problem gets solved!) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1250 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/constants.h | 1 + data/qcsrc/server/gamec/g_damage.c | 4 ++++ data/qcsrc/server/gamec/sv_main.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/data/qcsrc/server/gamec/constants.h b/data/qcsrc/server/gamec/constants.h index 8cc7c0806..7c5a96347 100644 --- a/data/qcsrc/server/gamec/constants.h +++ b/data/qcsrc/server/gamec/constants.h @@ -146,6 +146,7 @@ float DEATH_SWAMP = 10008; float DEATH_TEAMCHANGE = 10009; float DEATH_AUTOTEAMCHANGE = 10010; float DEATH_CAMP = 10011; +float DEATH_SHOOTING_STAR = 10012; float IT_LASER = 4096; float IT_SHOTGUN = 1; diff --git a/data/qcsrc/server/gamec/g_damage.c b/data/qcsrc/server/gamec/g_damage.c index a4d2916a6..647df7e5b 100644 --- a/data/qcsrc/server/gamec/g_damage.c +++ b/data/qcsrc/server/gamec/g_damage.c @@ -201,6 +201,8 @@ void Obituary (entity attacker, entity targ, float deathtype) bprint ("^1",s, "^1 was cooked by ", attacker.netname, "\n"); else if (deathtype == DEATH_FALL) bprint ("^1",s, "^1 was grounded by ", attacker.netname, "\n"); + else if (deathtype == DEATH_SHOOTING_STAR) + bprint ("^1",s, "^1 was shot into space by ", attacker.netname, "\n"); else if (deathtype == DEATH_SWAMP) bprint ("^1",s, "^1 was conserved by ", attacker.netname, "\n"); else if (deathtype == DEATH_HURTTRIGGER) @@ -267,6 +269,8 @@ void Obituary (entity attacker, entity targ, float deathtype) bprint ("^1",s, "^1 turned into hot slag\n"); else if (deathtype == DEATH_FALL) bprint ("^1",s, "^1 hit the ground with a crunch\n"); + else if (deathtype == DEATH_SHOOTING_STAR) + bprint ("^1",s, "^1 became a shooting star\n"); else if (deathtype == DEATH_SWAMP) bprint ("^1",s, "^1 is now conserved for centuries to come\n"); else diff --git a/data/qcsrc/server/gamec/sv_main.c b/data/qcsrc/server/gamec/sv_main.c index 885df12df..292c834b0 100644 --- a/data/qcsrc/server/gamec/sv_main.c +++ b/data/qcsrc/server/gamec/sv_main.c @@ -96,6 +96,8 @@ void CreatureFrame (void) } if (dm > 0) Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0'); + else if(vlen(self.velocity) > 20000) + Damage (self, world, world, 50 * frametime, DEATH_SHOOTING_STAR, self.origin, '0 0 0'); } // play stupid sounds -- 2.17.1