Skip to content

bugfix: Fix delays when requesting paths too quickly #2455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stubbjax wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

bugfix: Fix delays when requesting paths too quickly #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
return;
}
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 1 second",
Expand All @@ -507,6 +508,7 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
}
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());

}
Expand All @@ -524,12 +526,14 @@ void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* vic
m_isApproachPath = FALSE;
m_isSafePath = FALSE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand All @@ -547,12 +551,14 @@ void AIUpdateInterface::requestApproachPath( Coord3D *destination )
m_isApproachPath = TRUE;
m_isSafePath = FALSE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand All @@ -571,12 +577,14 @@ void AIUpdateInterface::requestSafePath( ObjectID repulsor )
m_isApproachPath = FALSE;
m_isSafePath = TRUE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
return;
}
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 1 second",
Expand All @@ -512,6 +513,7 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
}
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());

}
Expand All @@ -529,13 +531,15 @@ void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* vic
m_isApproachPath = FALSE;
m_isSafePath = FALSE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
setLocomotorGoalNone();
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand All @@ -553,12 +557,14 @@ void AIUpdateInterface::requestApproachPath( Coord3D *destination )
m_isApproachPath = TRUE;
m_isSafePath = FALSE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand All @@ -577,12 +583,14 @@ void AIUpdateInterface::requestSafePath( ObjectID repulsor )
m_isApproachPath = FALSE;
m_isSafePath = TRUE;
m_waitingForPath = TRUE;
#if RETAIL_COMPATIBLE_CRC
if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
/* Requesting path very quickly. Can cause a spin. */
//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames. Waiting 2 second",TheGameLogic->getFrame()));
setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
return;
}
#endif
TheAI->pathfinder()->queueForPath(getObject()->getID());
}

Expand Down
Loading