nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-04-04 08:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Add trigger_hurt spawnflag to kill Player instantly

Browse source
This commit is contained in:
MotoLegacy 2025-02-15 17:54:06 -08:00
parent 0f69c7f73d
commit 559b9caec5
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/server/entities/triggers.qc
View file

@ -401,8 +401,9 @@ void() trigger_awardpoints =
//
// NZ:P START -- Spawnflags for not hurting clients and not hurting AI
#define HURT_SPAWNFLAG_NOAI 1
#define HURT_SPAWNFLAG_NOCLIENT 2
#define HURT_SPAWNFLAG_NOAI 1 // Does not affect AI
#define HURT_SPAWNFLAG_NOCLIENT 2 // Does not affect clients (players)
#define HURT_SPAWNFLAG_DIEINSTANTLY 4 // Player will instantly die and spectate, regardless of other conditions
// NZ:P END
void() hurt_on =
@ -416,10 +417,15 @@ void() hurt_touch =
if ((other.classname == "player" && !(self.spawnflags & HURT_SPAWNFLAG_NOCLIENT)) ||
(other.aistatus == "1" && !(self.spawnflags & HURT_SPAWNFLAG_NOAI)))
{
self.solid = SOLID_NOT;
DamageHandler(other, self, self.dmg, DMG_TYPE_OTHER);
self.think = hurt_on;
self.nextthink = time + 1;
if ((self.spawnflags & HURT_SPAWNFLAG_DIEINSTANTLY) && other.classname == "player") {
LastStand_Begin(other);
LastStand_KillPlayer(other);
} else {
self.solid = SOLID_NOT;
DamageHandler(other, self, self.dmg, DMG_TYPE_OTHER);
self.think = hurt_on;
self.nextthink = time + 1;
}
if (self.message)
centerprint(other, strcat(self.message, "\n"));