zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-10 16:13:41 +01:00
commit 203110c6fe
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -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;

25
src/r_data/r_interpolate.cpp
View file

@ -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);
}
}

6
src/scripting/backend/codegen.cpp
View file

@ -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;
}