OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Yet more deathmatch stuff.

Browse source
This commit is contained in:
Mari the Deer 2021-06-04 21:35:17 +02:00
commit da703e3e35
8 changed files with 178 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/swwm_player.zsc
View file

@ -1963,6 +1963,10 @@ Class Demolitionist : PlayerPawn
player.mo.CalcHeight();
if ( player.damagecount ) player.damagecount--;
if ( player.poisoncount ) player.poisoncount--;
// solid unless we can respawn, for safety
if ( multiplayer || level.AllowRespawn || sv_singleplayerrespawn || G_SkillPropertyInt(SKILLP_PlayerRespawn) )
bSolid = false;
else bSolid = true;
if ( player.viewheight <= 6 )
{
deadtimer++;
@ -3129,7 +3133,7 @@ Class Demolitionist : PlayerPawn
XZW7 M 2
{
A_DemoScream();
bSOLID = true; // we need this to avoid clipping into things
A_NoBlocking();
}
XZW8 GHIJK 2;
XZW8 L 1 A_DMFade();