zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-01 00:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge http://github.com/rheit/zdoom

Browse source
This commit is contained in:
raa-eruanna 2016-09-28 06:40:58 -04:00
commit 2f557419ed
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_scroll.cpp
View file

@ -259,6 +259,7 @@ DScroller::DScroller (EScroll type, double dx, double dy,
m_Accel = accel; m_Accel = accel;
m_Parts = scrollpos; m_Parts = scrollpos;
m_vdx = m_vdy = 0; m_vdx = m_vdy = 0;
m_LastHeight = 0;
if ((m_Control = control) != -1) if ((m_Control = control) != -1)
m_LastHeight = m_LastHeight =
sectors[control].CenterFloor () + sectors[control].CenterCeiling (); sectors[control].CenterFloor () + sectors[control].CenterCeiling ();
@ -342,6 +343,7 @@ DScroller::DScroller (double dx, double dy, const line_t *l,
m_vdx = m_vdy = 0; m_vdx = m_vdy = 0;
m_Accel = accel; m_Accel = accel;
m_Parts = scrollpos; m_Parts = scrollpos;
m_LastHeight = 0;
if ((m_Control = control) != -1) if ((m_Control = control) != -1)
m_LastHeight = sectors[control].CenterFloor() + sectors[control].CenterCeiling(); m_LastHeight = sectors[control].CenterFloor() + sectors[control].CenterCeiling();
m_Affectee = int(l->sidedef[0] - sides); m_Affectee = int(l->sidedef[0] - sides);

10
src/serializer.cpp
View file

@ -215,8 +215,14 @@ struct FWriter
void Double(double k) void Double(double k)
{ {
if (mWriter1) mWriter1->Double(k); if (mWriter1)
else if (mWriter2) mWriter2->Double(k); {
if (!mWriter1->Double(k)) mWriter1->Double(0);
}
else if (mWriter2)
{
if (!mWriter2->Double(k)) mWriter2->Double(0);
}
} }
}; };