Merge remote-tracking branch 'gzdoom/master'
This commit is contained in:
commit
805bce1166
214 changed files with 10327 additions and 6393 deletions
|
|
@ -3771,7 +3771,8 @@ void AActor::Tick ()
|
|||
}
|
||||
else
|
||||
{
|
||||
|
||||
if (player)
|
||||
player->crossingPortal = false;
|
||||
if (!player || !(player->cheats & CF_PREDICTING))
|
||||
{
|
||||
// Handle powerup effects here so that the order is controlled
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue