OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'ChaseThresholdScript' of https://github.com/MajorCooke/zdoom

Browse source 
# Conflicts:
#	src/version.h
This commit is contained in:
Christoph Oelckers 2016-02-08 13:06:08 +01:00
commit 43b4d452db
12 changed files with 61 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.cpp
View file

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