Permalink
Browse files

Merge branch 'master' of https://github.com/coelckers/gzdoom

  • Loading branch information...
coelckers committed Jan 10, 2019
2 parents d6d66ca + 2cd1ac4 commit 203110c6fe576cac827bd448d271377ab40d6ffe
Showing with 24 additions and 9 deletions.
  1. +1 −1 src/g_level.cpp
  2. +17 −8 src/r_data/r_interpolate.cpp
  3. +6 −0 src/scripting/backend/codegen.cpp
@@ -2007,7 +2007,7 @@ class DSectorMarker : public DObject
};
DECLARE_CLASS(DSectorMarker, DObject)
public:
DSectorMarker(FLevelLocals *l) : SecNum(0),PolyNum(0),SideNum(0) {}
DSectorMarker(FLevelLocals *l) : Level(l), SecNum(0),PolyNum(0),SideNum(0) {}
size_t PropagateMark();
FLevelLocals *Level;
int SecNum;
@@ -535,7 +535,10 @@ void DSectorPlaneInterpolation::Serialize(FSerializer &arc)
("oldtexz", oldtexz)
("attached", attached);

sector->Level->interpolator.AddInterpolation(this);
if (arc.isReading())
{
sector->Level->interpolator.AddInterpolation(this);
}
}


@@ -656,7 +659,10 @@ void DSectorScrollInterpolation::Serialize(FSerializer &arc)
("oldx", oldx)
("oldy", oldy);

sector->Level->interpolator.AddInterpolation(this);
if (arc.isReading())
{
sector->Level->interpolator.AddInterpolation(this);
}
}


@@ -755,8 +761,10 @@ void DWallScrollInterpolation::Serialize(FSerializer &arc)
("oldx", oldx)
("oldy", oldy);

side->sector->Level->interpolator.AddInterpolation(this);

if (arc.isReading())
{
side->sector->Level->interpolator.AddInterpolation(this);
}
}

//==========================================================================
@@ -879,10 +887,11 @@ void DPolyobjInterpolation::Serialize(FSerializer &arc)
("oldverts", oldverts)
("oldcx", oldcx)
("oldcy", oldcy);
if (arc.isReading()) bakverts.Resize(oldverts.Size());

poly->GetLevel()->interpolator.AddInterpolation(this);

if (arc.isReading())
{
bakverts.Resize(oldverts.Size());
poly->GetLevel()->interpolator.AddInterpolation(this);
}
}


@@ -1881,6 +1881,12 @@ FxExpression *FxMinusSign::Resolve(FCompileContext& ctx)
delete this;
return e;
}
else if (Operand->ValueType == TypeBool)
{
Operand = new FxIntCast(Operand, true);
Operand = Operand->Resolve(ctx);
assert(Operand != nullptr);
}
ValueType = Operand->ValueType;
return this;
}

0 comments on commit 203110c

Please sign in to comment.