- took EResult out of DMover and made it an enum class.
This commit is contained in:
parent
fb2234396c
commit
e505bfd7a3
9 changed files with 57 additions and 56 deletions
|
|
@ -127,7 +127,7 @@ void DCeiling::PlayCeilingSound ()
|
|||
|
||||
void DCeiling::Tick ()
|
||||
{
|
||||
EResult res;
|
||||
EMoveResult res;
|
||||
|
||||
switch (m_Direction)
|
||||
{
|
||||
|
|
@ -138,7 +138,7 @@ void DCeiling::Tick ()
|
|||
// UP
|
||||
res = MoveCeiling (m_Speed, m_TopHeight, m_Direction);
|
||||
|
||||
if (res == pastdest)
|
||||
if (res == EMoveResult::pastdest)
|
||||
{
|
||||
switch (m_Type)
|
||||
{
|
||||
|
|
@ -169,7 +169,7 @@ void DCeiling::Tick ()
|
|||
// DOWN
|
||||
res = MoveCeiling (m_Speed, m_BottomHeight, m_Crush, m_Direction, m_CrushMode == ECrushMode::crushHexen);
|
||||
|
||||
if (res == pastdest)
|
||||
if (res == EMoveResult::pastdest)
|
||||
{
|
||||
switch (m_Type)
|
||||
{
|
||||
|
|
@ -198,7 +198,7 @@ void DCeiling::Tick ()
|
|||
}
|
||||
else // ( res != pastdest )
|
||||
{
|
||||
if (res == crushed)
|
||||
if (res == EMoveResult::crushed)
|
||||
{
|
||||
switch (m_Type)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue