Get rid of fallbackGroup

Warzone2100 · May 3, 2024 · 333b472 · 333b472
1 parent 2a0e824
commit 333b472
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/src/basedef.h b/src/basedef.h
@@ -96,7 +96,6 @@ struct BASE_OBJECT : public SIMPLE_OBJECT
 	SCREEN_DISP_DATA    sDisplay;                   ///< screen coordinate details
 	UBYTE               group = 0;                  ///< Which group selection is the droid currently in?
 	UBYTE               repairGroup = UBYTE_MAX;    ///< Group to be set when the unit has been repaired
-	UBYTE               fallbackGroup = UBYTE_MAX;  ///< Group to revert if the commander capacity is full
 	UBYTE               selected;                   ///< Whether the object is selected (might want this elsewhere)
 	UBYTE               visible[MAX_PLAYERS];       ///< Whether object is visible to specific player
 	UBYTE               seenThisTick[MAX_PLAYERS];  ///< Whether object has been seen this tick by the specific player.

diff --git a/src/cmddroid.cpp b/src/cmddroid.cpp
@@ -91,8 +91,6 @@ bool cmdDroidAddDroid(DROID *psCommander, DROID *psDroid)
 
 	auto initialDroidGroup = psDroid->group;
 	auto initialRepairDroidGroup = psDroid->repairGroup;
-	// select a value depending on whether the commander was assigned manually or after construction in the factory
-	auto fallbackDroidGroup = initialDroidGroup != UBYTE_MAX ? initialDroidGroup : psDroid->fallbackGroup;
 
 	if (psCommander->psGroup == nullptr)
 	{
@@ -127,10 +125,9 @@ bool cmdDroidAddDroid(DROID *psCommander, DROID *psDroid)
 			lastMaxCmdLimitMsgTime = gameTime;
 		}
 
-		if (fallbackDroidGroup != UBYTE_MAX)
+		if (initialDroidGroup != UBYTE_MAX)
 		{
-			psDroid->group = fallbackDroidGroup;
-			psDroid->fallbackGroup = UBYTE_MAX;
+			psDroid->group = initialDroidGroup;
 			SelectGroupDroid(psDroid);
 		}
 		psDroid->repairGroup = initialRepairDroidGroup;

diff --git a/src/structure.cpp b/src/structure.cpp
@@ -2478,19 +2478,14 @@ static bool structPlaceDroid(STRUCTURE *psStructure, DROID_TEMPLATE *psTempl, DR
 		psFact = &psStructure->pFunctionality->factory;
 		bool hasCommander = psFact->psCommander != nullptr && myResponsibility(psStructure->player);
 		// assign a group to the manufactured droid
-		// if a commander is assigned, ignore this behavior (except for builders)
 		if (psStructure->productToGroup != UBYTE_MAX)
 		{
+			psNewDroid->group = psStructure->productToGroup;
 			if (!hasCommander || isConstructionDroid(psNewDroid))
 			{
-				psNewDroid->group = psStructure->productToGroup;
 				intGroupsChanged(psNewDroid->group); // update groups UI
 				SelectGroupDroid(psNewDroid);
 			}
-			else
-			{
-				psNewDroid->fallbackGroup = psStructure->productToGroup;
-			}
 		}
 		setFactorySecondaryState(psNewDroid, psStructure);
 		const auto mapCoord = map_coord({x, y});