OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Hotfix: Ice death gibbing caused a crash due to the playerpawn ceasing to exist too early.

Browse source 
Updated patrons.
This commit is contained in:
Marisa the Magician 2020-05-06 13:00:33 +02:00
commit 32afdb2cee
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
menudef.txt
View file

@ -98,9 +98,11 @@ OptionMenu "UTCreditsMenu"
StaticText "Epic Games", "White" StaticText "Epic Games", "White"
StaticText " " StaticText " "
StaticText "$FLAK_CPATRON", "Gold" StaticText "$FLAK_CPATRON", "Gold"
StaticText "john, Alexa Jones-Gonzales, Jonas Höglund,", "White" StaticText "Christian Grab, john, Alexa Jones-Gonzales,", "White"
StaticText "Xada Xephron, Zard1084, Jonathan Nemo,", "White" StaticText "Jonas Höglund, Valerie Thiessen, Corey Hectus,", "White"
StaticText "NekoMithos, m8f, 3d0xp0xy", "White" StaticText "dac, Pietro Gagliardi, Artem Bashev,", "White"
StaticText "Xada Xephron, Zard1084, NekoMithos,", "White"
StaticText "Max Zeal, m8f, 3d0xp0xy", "White"
StaticText " " StaticText " "
StaticText "$FLAK_CTHANK", "Gold" StaticText "$FLAK_CTHANK", "Gold"
StaticText "KynikossDragonn, Raffine52, KeksDose, Skerion", "White" StaticText "KynikossDragonn, Raffine52, KeksDose, Skerion", "White"

8
zscript/utcommon.zsc
View file

@ -933,7 +933,7 @@ Class UTPlayer : DoomPlayer
|| InStateSequence(CurState,FindState("Turn")) ) || InStateSequence(CurState,FindState("Turn")) )
SetStateLabel("See2"); SetStateLabel("See2");
} }
else if ( !bNoGravity && (waterlevel < 1) ) else if ( !bNoGravity && (waterlevel < 1) && abs(pos.z-floorz) > maxstepheight )
{ {
// Falling // Falling
if ( InStateSequence(CurState,FindState("Spawn")) if ( InStateSequence(CurState,FindState("Spawn"))
@ -1086,7 +1086,7 @@ Class UTPlayer : DoomPlayer
// Gib the player, the camera will attach to the head at this point // Gib the player, the camera will attach to the head at this point
A_GibMe(); A_GibMe();
A_NoBlocking(); A_NoBlocking();
SetStateLabel('null'); SetStateLabel("IceBurst");
} }
void A_PainDT() void A_PainDT()
@ -1293,6 +1293,10 @@ Class UTPlayer : DoomPlayer
PICE A 5 A_FreezeDeath(); PICE A 5 A_FreezeDeath();
PICE A 1 A_FreezeDeathChunksDT(); PICE A 1 A_FreezeDeathChunksDT();
Wait; Wait;
IceBurst:
TNT1 A 35;
TNT1 A 1 A_CheckPlayerDone();
Wait;
} }
} }