dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial fix to a formation "gliding" issue, unsure so far what is causing this.

Browse source 
This was SVN commit r17198.
This commit is contained in:
wraitii 2015-11-07 17:36:31 +00:00
parent 3163c9d4a2
commit c319ff062d
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/simulation2/components/CCmpUnitMotion.cpp
View file

@ -581,6 +581,12 @@ private:
void StartSucceeded() void StartSucceeded()
{ {
CmpPtr<ICmpObstruction> cmpObstruction(GetEntityHandle());
if (cmpObstruction)
cmpObstruction->SetMovingFlag(true);
m_Moving = true;
CMessageMotionChanged msg(true, false); CMessageMotionChanged msg(true, false);
GetSimContext().GetComponentManager().PostMessage(GetEntityId(), msg); GetSimContext().GetComponentManager().PostMessage(GetEntityId(), msg);
} }
@ -1023,6 +1029,10 @@ void CCmpUnitMotion::Move(fixed dt)
CmpPtr<ICmpUnitMotion> cmpUnitMotion(GetSimContext(), m_TargetEntity); CmpPtr<ICmpUnitMotion> cmpUnitMotion(GetSimContext(), m_TargetEntity);
if (cmpUnitMotion && !cmpUnitMotion->IsMoving()) if (cmpUnitMotion && !cmpUnitMotion->IsMoving())
{ {
CmpPtr<ICmpObstruction> cmpObstruction(GetEntityHandle());
if (cmpObstruction)
cmpObstruction->SetMovingFlag(false);
m_Moving = false; m_Moving = false;
CMessageMotionChanged msg(false, false); CMessageMotionChanged msg(false, false);
GetSimContext().GetComponentManager().PostMessage(GetEntityId(), msg); GetSimContext().GetComponentManager().PostMessage(GetEntityId(), msg);
@ -1294,8 +1304,16 @@ ControlGroupMovementObstructionFilter CCmpUnitMotion::GetObstructionFilter(bool
void CCmpUnitMotion::BeginPathing(const CFixedVector2D& from, const PathGoal& goal) void CCmpUnitMotion::BeginPathing(const CFixedVector2D& from, const PathGoal& goal)
{ {
// Cancel any pending path requests // reset our state for sanity.
m_ExpectedPathTicket = 0; m_ExpectedPathTicket = 0;
CmpPtr<ICmpObstruction> cmpObstruction(GetEntityHandle());
if (cmpObstruction)
cmpObstruction->SetMovingFlag(false);
m_Moving = false;
m_PathState = PATHSTATE_NONE;
#if DISABLE_PATHFINDER #if DISABLE_PATHFINDER
{ {