From 14e0a85dcdfd5eec7ee9c98ae5a3bef35f0043c3 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Fri, 25 Aug 2023 14:40:54 -0700 Subject: [PATCH] idMover: style cleanup --- src/system/idMover.qc | 101 +++++++++++------------------------------- 1 file changed, 25 insertions(+), 76 deletions(-) diff --git a/src/system/idMover.qc b/src/system/idMover.qc index 4b0182d..4dba0de 100644 --- a/src/system/idMover.qc +++ b/src/system/idMover.qc @@ -2,10 +2,7 @@ void idMover::idMover( void ) { } - -vector -idMover::GetDirectionalPosition(vector vecAngle, float flLip) -{ +vector idMover::GetDirectionalPosition(vector vecAngle, float flLip) { vector vecMoveDir = g_vec_null; vector vecPos = g_vec_null; @@ -24,95 +21,65 @@ idMover::GetDirectionalPosition(vector vecAngle, float flLip) return vecPos; } -vector -idMover::GetDirectionalRotation(vector normalizedAngle, float travelDistance) -{ +vector idMover::GetDirectionalRotation(vector normalizedAngle, float travelDistance) { vector vecMoveDir = normalizedAngle; return (GetAngles() + vecMoveDir * travelDistance); } -void -idMover::SetMoverState(moverState_t val) -{ +void idMover::SetMoverState(moverState_t val) { m_moverState = val; } -moverState_t -idMover::GetMoverState(void) -{ +moverState_t idMover::GetMoverState(void) { return m_moverState; } -void -idMover::SetMoverType(moverType_t val) -{ +void idMover::SetMoverType(moverType_t val) { m_moverType = val; } -moverType_t -idMover::GetMoverType(void) -{ +moverType_t idMover::GetMoverType(void) { return m_moverType; } -void -idMover::SetMoverPosition1(vector val) -{ +void idMover::SetMoverPosition1(vector val) { m_vecPos1 = val; } -vector -idMover::GetMoverPosition1(void) -{ +vector idMover::GetMoverPosition1(void) { return m_vecPos1; } -void -idMover::SetMoverPosition2(vector val) -{ +void idMover::SetMoverPosition2(vector val) { m_vecPos2 = val; } -vector -idMover::GetMoverPosition2(void) -{ +vector idMover::GetMoverPosition2(void) { return m_vecPos2; } -void -idMover::SetMoverRotation1(vector val) -{ +void idMover::SetMoverRotation1(vector val) { m_vecPos3 = val; } -vector -idMover::GetMoverRotation1(void) -{ +vector idMover::GetMoverRotation1(void) { return m_vecPos3; } -void -idMover::SetMoverRotation2(vector val) -{ +void idMover::SetMoverRotation2(vector val) { m_vecPos4 = val; } -vector -idMover::GetMoverRotation2(void) -{ +vector idMover::GetMoverRotation2(void) { return m_vecPos4; } -void -idMover::MoveToPosition(vector vecDest, float flSpeed) -{ +void idMover::MoveToPosition(vector vecDest, float flSpeed) { MoveAndRotateToPosition(vecDest, GetAngles(), flSpeed); } -void -idMover::MoveAndRotateToPosition(vector vecDest, vector vecAngle, float flSpeed) -{ +void idMover::MoveAndRotateToPosition(vector vecDest, vector vecAngle, float flSpeed) { vector vecDifference; vector vecAngleDifference; float flTravel; @@ -183,9 +150,7 @@ idMover::MoveAndRotateToPosition(vector vecDest, vector vecAngle, float flSpeed) SetAngularVelocity((vecAngleDifference * (1.0 / fTravelTime))); } -void -idMover::MoveToReverse(float flSpeed) -{ +void idMover::MoveToReverse(float flSpeed) { if ((GetMoverState() == MOVER_POS2) || (GetMoverState() == MOVER_1TO2)){ MoveToPosition(GetMoverPosition1(), flSpeed); } else { @@ -193,15 +158,11 @@ idMover::MoveToReverse(float flSpeed) } } -void -idMover::RotateToPosition(vector vecAngle, float flSpeed) -{ +void idMover::RotateToPosition(vector vecAngle, float flSpeed) { MoveAndRotateToPosition(GetOrigin(), vecAngle, flSpeed); } -void -idMover::RotateToReverse(float flSpeed) -{ +void idMover::RotateToReverse(float flSpeed) { if ((GetMoverState() == MOVER_POS2) || (GetMoverState() == MOVER_1TO2)){ RotateToPosition(GetMoverRotation1(), flSpeed); } else { @@ -209,9 +170,7 @@ idMover::RotateToReverse(float flSpeed) } } -bool -idMover::IsMoving(void) -{ +bool idMover::IsMoving(void) { switch (GetMoverState()) { case MOVER_POS1: case MOVER_POS2: @@ -222,9 +181,7 @@ idMover::IsMoving(void) } } -void -idMover::_ArrivedAtRotPosition1(void) -{ +void idMover::_ArrivedAtRotPosition1(void) { SetOrigin(m_vecPos1); SetAngles(m_vecPos3); ClearVelocity(); @@ -233,9 +190,7 @@ idMover::_ArrivedAtRotPosition1(void) MoverFinishesMoving(); } -void -idMover::_ArrivedAtRotPosition2(void) -{ +void idMover::_ArrivedAtRotPosition2(void) { SetOrigin(m_vecPos2); SetAngles(m_vecPos4); ClearVelocity(); @@ -244,18 +199,12 @@ idMover::_ArrivedAtRotPosition2(void) MoverFinishesMoving(); } -void -idMover::_BeginMoving(void) -{ +void idMover::_BeginMoving(void) { } -void -idMover::MoverStartsMoving(void) -{ +void idMover::MoverStartsMoving(void) { } -void -idMover::MoverFinishesMoving(void) -{ +void idMover::MoverFinishesMoving(void) { } \ No newline at end of file