Merge tag 'g4.12.2'

This commit is contained in:
Magnus Norddahl 2024-06-23 22:27:45 +02:00
commit 330ec45d84
26 changed files with 181 additions and 107 deletions

View file

@ -393,7 +393,13 @@ void AActor::Serialize(FSerializer &arc)
A("userlights", UserLights)
A("WorldOffset", WorldOffset)
("modelData", modelData)
A("LandingSpeed", LandingSpeed);
A("LandingSpeed", LandingSpeed)
("unmorphtime", UnmorphTime)
("morphflags", MorphFlags)
("premorphproperties", PremorphProperties)
("morphexitflash", MorphExitFlash);
SerializeTerrain(arc, "floorterrain", floorterrain, &def->floorterrain);
SerializeArgs(arc, "args", args, def->args, special);
@ -3656,10 +3662,6 @@ void AActor::SetViewAngle(DAngle ang, int fflags)
double AActor::GetFOV(double ticFrac)
{
// [B] Disable interpolation when playing online, otherwise it gets vomit inducing
if (netgame)
return player ? player->FOV : CameraFOV;
double fov;
if (player)
{