Merge https://github.com/coelckers/gzdoom

2017-04-22 22:02:20 -04:00 · 2017-04-22 22:02:20 -04:00 · c71d23f519
commit c71d23f519
parent b2ba7a4e18 fe2864d396
16 changed files with 1927 additions and 177 deletions
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@ -436,6 +436,7 @@ void AActor::Serialize(FSerializer &arc)
 		A("stamina", stamina)
 		("goal", goal)
 		A("waterlevel", waterlevel)
+		A("boomwaterlevel", boomwaterlevel)
 		A("minmissilechance", MinMissileChance)
 		A("spawnflags", SpawnFlags)
 		("inventory", Inventory)