Group formation is removed after using waypoints

[xezon]

Group formation is removed after using waypoints.

[diqezit]

By the way, there's a bug here. I'm currently digging through the file GeneralsGameCode\GeneralsMD\Code\GameEngine\Source\GameLogic\AI\AIGroup.cpp, and I can confirm that it's there.

kill two rabbits at once: fix #218 and #222

GeneralsGameCode/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp

Lines 1591 to 1792 in 39647c3

	void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, CommandSourceType cmdSource )
	{
	Coord3D position = *p_posIn;
	Coord3D *pos = &position;
	Bool didInfantry = false;
	Bool didVehicles = false;
	// compute current centroid of the team
	Coord3D center;
	Coord2D min;
	Coord2D max;
	Coord3D dest;
	Bool tightenGroup = FALSE;
	Bool isFormation = getMinMaxAndCenter( &min, &max, &center );
	if (addWaypoint)
	{
	isFormation = false;
	}
	if (!addWaypoint && !isFormation) {
	friend_computeGroundPath(pos, cmdSource);
	didInfantry = friend_moveInfantryToPos(pos, cmdSource);
	didVehicles = friend_moveVehicleToPos(pos, cmdSource);
	}
	if (m_dirty)
	recompute();
	std::list<Object *>::iterator i;
	if( !isFormation && cmdSource == CMD_FROM_PLAYER && TheGlobalData->m_groupMoveClickToGatherFactor > 0.0f )
	{
	ScaleRect2D( &min, &max, TheGlobalData->m_groupMoveClickToGatherFactor );
	if( Coord3DInsideRect2D( pos, &min, &max ) )
	{
	tightenGroup = TRUE;
	}
	}
	Real extraMargin = 0.0f;
	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
	{
	const Object *groupMember = (*i);
	if ( groupMember->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) )//helicopter
	{
	isFormation = FALSE;
	extraMargin = MAX( extraMargin, groupMember->getGeometryInfo().getMajorRadius() );
	}
	else if ( groupMember->isKindOf( KINDOF_AIRCRAFT ) )// fixed wing aircraft only
	{
	if ( groupMember->getAI() && groupMember->getAI()->isDoingGroundMovement() == FALSE ) //if unit is airborne
	{
	tightenGroup = FALSE; // Don't tighten aircraft. It is a bad idea. jba.
	isFormation = FALSE;//then keep spread formation after move
	}
	extraMargin = MAX( extraMargin, STD_AIRCRAFT_EXTRA_MARGIN );
	}
	}
	Int margin = STD_WAYPOINT_CLAMP_MARGIN + extraMargin;
	clampWaypointPosition( position, margin );
	if (tightenGroup)
	{
	isFormation = false;
	if (!addWaypoint) {
	Int dx = (max.x-min.x)/PATHFIND_CELL_SIZE_F;
	Int dy = (max.x-min.x)/PATHFIND_CELL_SIZE_F;
	Int cells = (dx*dy);
	if (cells<2000) {
	groupTightenToPosition(pos, false, cmdSource);
	return;
	}
	}
	}
	if (isFormation) {
	friend_computeGroundPath(pos, cmdSource);
	friend_moveFormationToPos(pos, cmdSource);
	return;
	}
	// Move.
	MemoryPoolObjectHolder iterHolder;
	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
	iterHolder.hold(iter);
	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
	{
	Real dx, dy;
	if ((*i)->isDisabledByType( DISABLED_HELD ) )
	{
	continue; // don't bother telling the occupants to move.
	}
	if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
	{
	continue;
	}
	if( (*i)->getAI()==nullptr )
	{
	continue;
	}
	if ((*i)->isKindOf(KINDOF_INFANTRY) && didInfantry) {
	continue;
	}
	if ((*i)->isKindOf(KINDOF_VEHICLE) && didVehicles)
	{
	if( (*i)->getAI()->isDoingGroundMovement() )
	{
	Object *obj = (*i);
	if( !obj->isKindOf( KINDOF_CLIFF_JUMPER ) )
	{
	//Not a cliff-jumper-offer unit.
	continue;
	}
	}
	}
	Coord3D unitPos = *((*i)->getPosition());
	TheAI->pathfinder()->removeGoal(*i);
	dx = unitPos.x - pos->x;
	dy = unitPos.y - pos->y;
	// adjust so units are sorted first by move priority.
	Real adjust = 0;
	#if 0 // Nope. jba.
	LocomotorPriority movePriority = LOCO_MOVES_FRONT;
	AIUpdateInterface *ai = (*i)->getAIUpdateInterface();
	if (ai->getCurLocomotor()) {
	movePriority = ai->getCurLocomotor()->getMovePriority();
	if (movePriority == LOCO_MOVES_MIDDLE) {
	adjust = 100*100*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
	} else if (movePriority == LOCO_MOVES_BACK) {
	adjust = 200*200*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
	}
	}
	#endif
	iter->insert((*i), adjust + dx*dx+dy*dy);
	}
	Coord3D goalPos = *pos;
	iter->sort(ITER_SORTED_NEAR_TO_FAR);
	// Works better if you let the near units get the first paths... jba.
	// Move the ones nearest the goal first. Reduces collision problems later.
	Object *theUnit;
	Bool firstUnit = true;
	for (theUnit = iter->first(); theUnit; theUnit = iter->next())
	{
	theUnit->setFormationID(NO_FORMATION_ID);
	AIUpdateInterface *ai = theUnit->getAIUpdateInterface();
	if (firstUnit) {
	if (isFormation) {
	Coord2D v;
	theUnit->getFormationOffset(&v);
	goalPos.x -= v.x;
	goalPos.y -= v.y;
	} else {
	center = *theUnit->getPosition();
	}
	firstUnit = false;
	}
	computeIndividualDestination( &dest, &goalPos, theUnit, &center, isFormation );
	if( cmdSource == CMD_FROM_PLAYER && theUnit->getStatusBits().test( OBJECT_STATUS_CAN_STEALTH ) && ai->canAutoAcquire() )
	{
	//When ordering a combat stealth unit to move, there is a single special case we want to handle.
	//When a stealth unit is currently not stealthed and doesn't autoacquire while stealthed,
	//then when the player specifically orders the unit to stop, we want to not autoacquire until
	//he is able to stealth again. Of course, if he's detected, then don't bother trying.
	if( !theUnit->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && !theUnit->getStatusBits().test( OBJECT_STATUS_DETECTED ) )
	{
	//Not stealthed, not detected -- so do auto-acquire while stealthed?
	if( !ai->canAutoAcquireWhileStealthed() )
	{
	StealthUpdate *stealth = theUnit->getStealth();
	if( stealth )
	{
	//Delay the mood check time (for autoacquire) until after the unit can stealth again.
	UnsignedInt stealthFrames = stealth->getStealthDelay();
	//Skew it a little due to having a large group selected.
	UnsignedInt randomFrames = GameLogicRandomValue( 0, LOGICFRAMES_PER_SECOND );
	ai->setNextMoodCheckTime( TheGameLogic->getFrame() + stealthFrames + randomFrames );
	}
	}
	}
	}
	if( !addWaypoint )
	{
	ai->aiMoveToPosition( &dest, cmdSource );
	}
	else
	{
	ai->aiFollowPathAppend(&dest, cmdSource);
	}
	}
	}

---

Change to

void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, CommandSourceType cmdSource )
{

  Coord3D position = *p_posIn;
  Coord3D *pos = &position;

	Bool didInfantry = false;
	Bool didVehicles = false;
	// compute current centroid of the team
	Coord3D center;
	Coord2D min;
	Coord2D max;
	Coord3D dest;
	Bool tightenGroup = FALSE;

	Bool isFormation = getMinMaxAndCenter( &min, &max, &center );

	// TheSuperHackers @bugfix Diqezit 2026 Save original formation state before any overrides
	Bool hadFormation = isFormation;

	if (addWaypoint)
  {
    isFormation = false;
  }


	if (!addWaypoint && !isFormation) {
		friend_computeGroundPath(pos, cmdSource);
		didInfantry = friend_moveInfantryToPos(pos, cmdSource);
		didVehicles = friend_moveVehicleToPos(pos, cmdSource);
	}
	if (m_dirty)
		recompute();

	std::list<Object *>::iterator i;
	if( !isFormation && cmdSource == CMD_FROM_PLAYER && TheGlobalData->m_groupMoveClickToGatherFactor > 0.0f )
	{
		ScaleRect2D( &min, &max, TheGlobalData->m_groupMoveClickToGatherFactor );

		if( Coord3DInsideRect2D( pos, &min, &max ) )
		{
			tightenGroup = TRUE;
		}
	}

  Real extraMargin = 0.0f;

	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
	{
    const Object *groupMember = (*i);

    if ( groupMember->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) )//helicopter
    {
      isFormation = FALSE;
      extraMargin = MAX( extraMargin, groupMember->getGeometryInfo().getMajorRadius() );
    }
    else if ( groupMember->isKindOf( KINDOF_AIRCRAFT ) )// fixed wing aircraft only
    {
			if ( groupMember->getAI() && groupMember->getAI()->isDoingGroundMovement() == FALSE ) //if unit is airborne
      {
				tightenGroup = FALSE;	// Don't tighten aircraft.  It is a bad idea. jba.
				isFormation = FALSE;//then keep spread formation after move
      }

      extraMargin = MAX( extraMargin, STD_AIRCRAFT_EXTRA_MARGIN );
		}
	}

  Int margin = STD_WAYPOINT_CLAMP_MARGIN + extraMargin;
  clampWaypointPosition( position, margin );




	if (tightenGroup)
	{
		isFormation = false;
		if (!addWaypoint) {
			Int dx = (max.x-min.x)/PATHFIND_CELL_SIZE_F;
                        Int dy = (max.y - min.y) / PATHFIND_CELL_SIZE_F;
			Int cells = (dx*dy);
			if (cells<2000) {
				groupTightenToPosition(pos, false, cmdSource);
				return;
			}
		}
	}

	if (isFormation) {
		friend_computeGroundPath(pos, cmdSource);
		friend_moveFormationToPos(pos, cmdSource);
		return;
	}

	// Move.
	MemoryPoolObjectHolder iterHolder;
	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
	iterHolder.hold(iter);
	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
	{
		Real dx, dy;
		if ((*i)->isDisabledByType( DISABLED_HELD ) )
		{
			continue; // don't bother telling the occupants to move.
		}
		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
		{
			continue;
		}
		if( (*i)->getAI()==nullptr )
		{
			continue;
		}
		if ((*i)->isKindOf(KINDOF_INFANTRY) && didInfantry) {
			continue;
		}
		if ((*i)->isKindOf(KINDOF_VEHICLE) && didVehicles)
		{
			if( (*i)->getAI()->isDoingGroundMovement() )
			{
				Object *obj = (*i);
				if( !obj->isKindOf( KINDOF_CLIFF_JUMPER ) )
				{
					//Not a cliff-jumper-offer unit.
					continue;
				}
			}
		}
		Coord3D unitPos = *((*i)->getPosition());
		TheAI->pathfinder()->removeGoal(*i);
		dx = unitPos.x - pos->x;
		dy = unitPos.y - pos->y;
		// adjust so units are sorted first by move priority.
		Real adjust = 0;
#if 0	 // Nope.  jba.
		LocomotorPriority movePriority = LOCO_MOVES_FRONT;
		AIUpdateInterface *ai = (*i)->getAIUpdateInterface();
		if (ai->getCurLocomotor()) {
			movePriority = ai->getCurLocomotor()->getMovePriority();
			if (movePriority == LOCO_MOVES_MIDDLE) {
				adjust = 100*100*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
			} else if (movePriority == LOCO_MOVES_BACK) {
				adjust = 200*200*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
			}
		}
#endif
		iter->insert((*i), adjust + dx*dx+dy*dy);
	}

	Coord3D goalPos = *pos;
	iter->sort(ITER_SORTED_NEAR_TO_FAR);
	// Works better if you let the near units get the first paths... jba.
	// Move the ones nearest the goal first.  Reduces collision problems later.
	Object *theUnit;
	Bool firstUnit = true;
	for (theUnit = iter->first(); theUnit; theUnit = iter->next())
	{
		// TheSuperHackers @bugfix Diqezit 2026 Only clear formationID when no formation existed
		if (!hadFormation)
		{
			theUnit->setFormationID(NO_FORMATION_ID);
		}

		AIUpdateInterface *ai = theUnit->getAIUpdateInterface();
		if (firstUnit) {
			if (isFormation) {
				Coord2D v;
				theUnit->getFormationOffset(&v);
				goalPos.x -= v.x;
				goalPos.y -= v.y;
			}	else {
				center = *theUnit->getPosition();
			}
			firstUnit = false;
		}
		computeIndividualDestination( &dest, &goalPos, theUnit, &center, isFormation );

		if( cmdSource == CMD_FROM_PLAYER && theUnit->getStatusBits().test( OBJECT_STATUS_CAN_STEALTH ) && ai->canAutoAcquire() )
		{
			//When ordering a combat stealth unit to move, there is a single special case we want to handle.
			//When a stealth unit is currently not stealthed and doesn't autoacquire while stealthed,
			//then when the player specifically orders the unit to stop, we want to not autoacquire until
			//he is able to stealth again. Of course, if he's detected, then don't bother trying.
			if( !theUnit->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && !theUnit->getStatusBits().test( OBJECT_STATUS_DETECTED ) )
			{
				//Not stealthed, not detected -- so do auto-acquire while stealthed?
				if( !ai->canAutoAcquireWhileStealthed() )
				{
          StealthUpdate *stealth = theUnit->getStealth();
					if( stealth )
					{
						//Delay the mood check time (for autoacquire) until after the unit can stealth again.
						UnsignedInt stealthFrames = stealth->getStealthDelay();
						//Skew it a little due to having a large group selected.
						UnsignedInt randomFrames = GameLogicRandomValue( 0, LOGICFRAMES_PER_SECOND );
						ai->setNextMoodCheckTime( TheGameLogic->getFrame() + stealthFrames + randomFrames );
					}
				}
			}
		}

		if( !addWaypoint )
		{
			ai->aiMoveToPosition( &dest, cmdSource );
		}
		else
		{
			ai->aiFollowPathAppend(&dest, cmdSource);
		}
	}
}