OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Reapply "Improvements to death and cheat handling"

Browse source 
This reverts commit c7bba2a126.
This commit is contained in:
Boondorl 2024-04-17 19:55:08 -04:00 • committed by Rachael Alexanderson
commit bcd6c6170e
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
25 changed files with 873 additions and 744 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/p_user.cpp
View file

@ -693,7 +693,7 @@ bool player_t::Resurrect()
P_BringUpWeapon(this);
}
if (morphTics)
if (mo->alternative != nullptr)
{
P_UnmorphActor(mo, mo);
}
@ -1172,7 +1172,7 @@ void P_CheckEnvironment(player_t *player)
P_PlayerOnSpecialFlat(player, P_GetThingFloorType(player->mo));
}
if (player->mo->Vel.Z <= -player->mo->FloatVar(NAME_FallingScreamMinSpeed) &&
player->mo->Vel.Z >= -player->mo->FloatVar(NAME_FallingScreamMaxSpeed) && !player->morphTics &&
player->mo->Vel.Z >= -player->mo->FloatVar(NAME_FallingScreamMaxSpeed) && player->mo->alternative == nullptr &&
player->mo->waterlevel == 0)
{
auto id = S_FindSkinnedSound(player->mo, S_FindSound("*falling"));