diff options
author | /dev/humancontroller <devhc@example.com> | 2017-04-13 11:30:00 +0000 |
---|---|---|
committer | /dev/humancontroller <devhc@example.com> | 2017-04-15 17:24:18 +0200 |
commit | bfb616d6541e4e0333b7d1ed53b945d16d18fad9 (patch) | |
tree | 517f8359df41297daa30a3a0ac716f0d5ab6f4c7 /src/game/g_combat.c | |
parent | f38f646bfc1b9b3904359b92cbd16377cd618308 (diff) |
fix noclipping players affecting other players
notably, other players were able to stand on the "center" of a noclipped player
set no r.contents flags for noclipping clients, keeping the saved r.contents value in the new ent->client->pers.cliprcontents field
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r-- | src/game/g_combat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index a992c17..111d2ea 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -658,7 +658,10 @@ finish_dying: // from MOD_SLAP self->takedamage = qfalse; // can still be gibbed self->s.weapon = WP_NONE; - self->r.contents = CONTENTS_CORPSE; + if( self->client->noclip ) + self->client->pers.cliprcontents = CONTENTS_CORPSE; + else + self->r.contents = CONTENTS_CORPSE; self->s.angles[ PITCH ] = 0; self->s.angles[ ROLL ] = 0; |