mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
Do not respawn on damaging floors when sv_samespawnspot is enabled
See http://forum.zdoom.org/viewtopic.php?t=47191
This commit is contained in:
parent
1285dde615
commit
6166520b33
1 changed files with 1 additions and 0 deletions
|
@ -4431,6 +4431,7 @@ APlayerPawn *P_SpawnPlayer (FPlayerStart *mthing, int playernum, int flags)
|
||||||
( gameaction != ga_worlddone ) &&
|
( gameaction != ga_worlddone ) &&
|
||||||
( p->mo != NULL ) &&
|
( p->mo != NULL ) &&
|
||||||
( !(p->mo->Sector->Flags & SECF_NORESPAWN) ) &&
|
( !(p->mo->Sector->Flags & SECF_NORESPAWN) ) &&
|
||||||
|
( NULL != p->attacker ) && // don't respawn on damaging floors
|
||||||
( p->mo->Sector->damageamount < TELEFRAG_DAMAGE )) // this really should be a bit smarter...
|
( p->mo->Sector->damageamount < TELEFRAG_DAMAGE )) // this really should be a bit smarter...
|
||||||
{
|
{
|
||||||
spawn_x = p->mo->X();
|
spawn_x = p->mo->X();
|
||||||
|
|
Loading…
Reference in a new issue