zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed conditions tested for when checking whether "Force respawn" or "Respawn protection" dmflags are enabled

Browse source
This commit is contained in:
Player701 2019-04-14 11:41:36 +03:00 committed by Rachael Alexanderson
parent 8ab6747d77
commit ad23726cb6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wadsrc/static/zscript/actors/player/player.zs
View file

@ -231,7 +231,7 @@ class PlayerPawn : Actor
virtual void OnRespawn() virtual void OnRespawn()
{ {
if (sv_respawnprotect && (multiplayer || alwaysapplydmflags)) if (sv_respawnprotect && (deathmatch || alwaysapplydmflags))
{ {
let invul = Powerup(Spawn("PowerInvulnerable")); let invul = Powerup(Spawn("PowerInvulnerable"));
invul.EffectTics = 3 * TICRATE; invul.EffectTics = 3 * TICRATE;
@ -718,7 +718,7 @@ class PlayerPawn : Actor
} }
if ((player.cmd.buttons & BT_USE || if ((player.cmd.buttons & BT_USE ||
((multiplayer || alwaysapplydmflags) && sv_forcerespawn)) && !sv_norespawn) ((deathmatch || alwaysapplydmflags) && sv_forcerespawn)) && !sv_norespawn)
{ {
if (Level.maptime >= player.respawn_time || ((player.cmd.buttons & BT_USE) && player.Bot == NULL)) if (Level.maptime >= player.respawn_time || ((player.cmd.buttons & BT_USE) && player.Bot == NULL))
{ {