OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed merge conflicts.

Browse source
This commit is contained in:
MajorCooke 2016-02-02 18:26:20 -06:00
commit a1c1de9edb
11 changed files with 59 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.cpp
View file

@ -348,6 +348,10 @@ void AActor::Serialize (FArchive &arc)
<< RipLevelMin
<< RipLevelMax;
}
if (SaveVersion >= 4531)
{
arc << DefThreshold;
}
{
FString tagstr;