Changeset View
Changeset View
Standalone View
Standalone View
ps/trunk/source/simulation2/components/CCmpUnitMotion.cpp
| Show First 20 Lines • Show All 1,062 Lines • ▼ Show 20 Lines | if (cmpVisual) | ||||
| cmpVisual->SelectMovementAnimation("idle", fixed::FromInt(1)); | cmpVisual->SelectMovementAnimation("idle", fixed::FromInt(1)); | ||||
| } | } | ||||
| // Moved this turn, didn't last turn | // Moved this turn, didn't last turn | ||||
| else if (speed > fixed::Zero() && m_CurSpeed == fixed::Zero()) | else if (speed > fixed::Zero() && m_CurSpeed == fixed::Zero()) | ||||
| { | { | ||||
| if (cmpObstruction) | if (cmpObstruction) | ||||
| cmpObstruction->SetMovingFlag(true); | cmpObstruction->SetMovingFlag(true); | ||||
| if (cmpVisual) | if (cmpVisual) | ||||
| cmpVisual->SelectMovementAnimation(speed > m_WalkSpeed ? "run" : "walk", speed); | cmpVisual->SelectMovementAnimation(speed > (m_WalkSpeed / 2).Multiply(m_RunMultiplier + fixed::FromInt(1)) ? "run" : "walk", speed); | ||||
| } | } | ||||
| // Speed change, update the visual actor if necessary. | // Speed change, update the visual actor if necessary. | ||||
| else if (speed != m_CurSpeed && cmpVisual) | else if (speed != m_CurSpeed && cmpVisual) | ||||
| cmpVisual->SelectMovementAnimation(speed > m_WalkSpeed ? "run" : "walk", speed); | cmpVisual->SelectMovementAnimation(speed > (m_WalkSpeed / 2).Multiply(m_RunMultiplier + fixed::FromInt(1)) ? "run" : "walk", speed); | ||||
| m_CurSpeed = speed; | m_CurSpeed = speed; | ||||
| } | } | ||||
| bool CCmpUnitMotion::HandleObstructedMove(bool moved) | bool CCmpUnitMotion::HandleObstructedMove(bool moved) | ||||
| { | { | ||||
| CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle()); | CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle()); | ||||
| if (!cmpPosition || !cmpPosition->IsInWorld()) | if (!cmpPosition || !cmpPosition->IsInWorld()) | ||||
| ▲ Show 20 Lines • Show All 543 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator