Skip to content

[GEN][ZH] Fix game crash in AIGroup::groupSell() #1200

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

Merged
xezon merged 1 commit into from
Jun 30, 2025
Merged

[GEN][ZH] Fix game crash in AIGroup::groupSell() #1200

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
24 changes: 11 additions & 13 deletions Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2722,23 +2722,21 @@ void AIGroup::groupCheer( CommandSourceType cmdSource )
*/
void AIGroup::groupSell( CommandSourceType cmdSource )
{
std::list<Object *>::iterator i, thisIterator;
Object *obj;
std::list<Object *>::iterator i;
std::vector<Object *> groupObjectsCopy;
groupObjectsCopy.reserve(m_memberListSize);
Comment thread
Mauller marked this conversation as resolved.
Outdated

// TheSuperHackers @bugfix Mauller 26/06/2025 when sellObject is called, the member list objects in this AIGroup get removed from it. This happens within the Object::deselectObject() function.
// This deletes the local AIGroup object from under the call to groupSell, therefore we need to make a local copy of the objects that need selling.
for( i = m_memberList.begin(); i != m_memberList.end(); /*empty*/ )
Comment thread
Mauller marked this conversation as resolved.
Outdated
{
groupObjectsCopy.push_back( *i++ );
}

// work off of 'thisIterator' as we may change the contents of this list
thisIterator = i;
++i;

// get object
obj = *thisIterator;

// try to sell object
TheBuildAssistant->sellObject( obj );

} // end for, i
for( size_t j = 0; j < groupObjectsCopy.size(); ++j )
{
TheBuildAssistant->sellObject( groupObjectsCopy[j] );
}

}

Expand Down
24 changes: 11 additions & 13 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2795,23 +2795,21 @@ void AIGroup::groupCheer( CommandSourceType cmdSource )
*/
void AIGroup::groupSell( CommandSourceType cmdSource )
{
std::list<Object *>::iterator i, thisIterator;
Object *obj;
std::list<Object *>::iterator i;
std::vector<Object *> groupObjectsCopy;
groupObjectsCopy.reserve(m_memberListSize);

// TheSuperHackers @bugfix Mauller 26/06/2025 when sellObject is called, the member list objects in this AIGroup get removed from it. This happens within the Object::deselectObject() function.
// This deletes the local AIGroup object from under the call to groupSell, therefore we need to make a local copy of the objects that need selling.
for( i = m_memberList.begin(); i != m_memberList.end(); /*empty*/ )
{
groupObjectsCopy.push_back( *i++ );
}

// work off of 'thisIterator' as we may change the contents of this list
thisIterator = i;
++i;

// get object
obj = *thisIterator;

// try to sell object
TheBuildAssistant->sellObject( obj );

} // end for, i
for( size_t j = 0; j < groupObjectsCopy.size(); ++j )
{
TheBuildAssistant->sellObject( groupObjectsCopy[j] );
}

}

Expand Down
Loading