OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made MoveAttached, MoveCeiling and MoveFloor members of sector_t instead of DMover.

Browse source 
- call MoveFloor and MoveCeiling directly in FS's floorheight and ceilingheight functions and remove the dummy thinkers it had to use before.
This commit is contained in:
Christoph Oelckers 2016-04-08 14:18:46 +02:00
commit 8535a973cf
9 changed files with 119 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_pillar.cpp
View file

@ -96,13 +96,13 @@ void DPillar::Tick ()
if (m_Type == pillarBuild)
{
r = MoveFloor (m_FloorSpeed, m_FloorTarget, m_Crush, 1, m_Hexencrush);
s = MoveCeiling (m_CeilingSpeed, m_CeilingTarget, m_Crush, -1, m_Hexencrush);
r = m_Sector->MoveFloor (m_FloorSpeed, m_FloorTarget, m_Crush, 1, m_Hexencrush);
s = m_Sector->MoveCeiling (m_CeilingSpeed, m_CeilingTarget, m_Crush, -1, m_Hexencrush);
}
else
{
r = MoveFloor (m_FloorSpeed, m_FloorTarget, m_Crush, -1, m_Hexencrush);
s = MoveCeiling (m_CeilingSpeed, m_CeilingTarget, m_Crush, 1, m_Hexencrush);
r = m_Sector->MoveFloor (m_FloorSpeed, m_FloorTarget, m_Crush, -1, m_Hexencrush);
s = m_Sector->MoveCeiling (m_CeilingSpeed, m_CeilingTarget, m_Crush, 1, m_Hexencrush);
}
if (r == EMoveResult::pastdest && s == EMoveResult::pastdest)
@ -114,11 +114,11 @@ void DPillar::Tick ()
{
if (r == EMoveResult::crushed)
{
MoveFloor (m_FloorSpeed, oldfloor, -1, -1, m_Hexencrush);
m_Sector->MoveFloor (m_FloorSpeed, oldfloor, -1, -1, m_Hexencrush);
}
if (s == EMoveResult::crushed)
{
MoveCeiling (m_CeilingSpeed, oldceiling, -1, 1, m_Hexencrush);
m_Sector->MoveCeiling (m_CeilingSpeed, oldceiling, -1, 1, m_Hexencrush);
}
}
}