Skip to content

Fix: Object trigger and pathfinder update issues #376

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
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Object trigger and pathfinder update issues #376

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
17 changes: 15 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2353,7 +2353,12 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
return; // didn't move enough to change integer position.
}

if (getAIUpdateInterface())
// TheSuperHackers @bugfix Only update the pathfinder position after game initialization is
// complete. During startNewGame, bridge objects are positioned before TheTerrainLogic->newMap()
// is called, which means W3DTreeBuffer (initialized inside newMap) may not yet exist.
// Calling updatePos at that point causes an access violation inside W3DTreeBuffer::unitMoved.
// Frame 0 corresponds to the loading/initialization phase; gameplay begins at frame 1.
if (getAIUpdateInterface() && TheGameLogic->getFrame() > 0)
{
TheAI->pathfinder()->updatePos(this, getPosition());
}
Expand All @@ -2366,7 +2371,10 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
Int i;
for (i=0; i<m_numTriggerAreasActive; i++)
{
if (!m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos))
// TheSuperHackers @bugfix Guard against a null or dangling pTrigger pointer, which can
// occur if a PolygonTrigger was deleted (e.g. via deleteTriggers) while the object still
// holds a reference to it in m_triggerInfo.
if (!m_triggerInfo[i].pTrigger || !m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos))
{
m_triggerInfo[i].isInside = false;
m_triggerInfo[i].exited = true;
Expand All @@ -2384,6 +2392,11 @@ void Object::setTriggerAreaFlagsForChangeInPosition()

for (const PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext())
{
// TheSuperHackers @bugfix Skip water area polygon triggers. Water areas are not script
// trigger areas and should not be checked for unit entry/exit events.
if (pTrig->isWaterArea())
continue;

Bool skip = false;
for (i = 0; i < m_numTriggerAreasActive; i++)
{
Expand Down