Merge pull request #1990 from ShishkinP/assignment-inventory-enhancement

Put the content of the primary hand in the secondary (not a pocket) when assigning doctor/repair tasks
ja2-stracciatella · May 15, 2024 · ebcdbc0 · ebcdbc0
2 parents 5d0e47a + 8d0b106
commit ebcdbc0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/game/Strategic/Assignments.cc b/src/game/Strategic/Assignments.cc
@@ -3332,6 +3332,10 @@ static void MakeSureToolKitIsInHand(SOLDIERTYPE* pSoldier)
 			if( pSoldier -> inv[ bPocket ].usItem == TOOLKIT )
 			{
 				SwapObjs( &pSoldier -> inv[ HANDPOS ], &pSoldier -> inv[ bPocket ] );
+				if (pSoldier->inv[SECONDHANDPOS].usItem == NOTHING && pSoldier->inv[bPocket].usItem != NOTHING)
+				{
+					SwapObjs(&pSoldier->inv[SECONDHANDPOS], &pSoldier->inv[bPocket]);
+				}
 				break;
 			}
 		}
@@ -3358,6 +3362,10 @@ static BOOLEAN MakeSureMedKitIsInHand(SOLDIERTYPE* pSoldier)
 		{
 			fCharacterInfoPanelDirty = TRUE;
 			SwapObjs( &pSoldier -> inv[ HANDPOS ], &pSoldier -> inv[ bPocket ] );
+			if (pSoldier->inv[SECONDHANDPOS].usItem == NOTHING && pSoldier->inv[bPocket].usItem != NOTHING)
+			{
+				SwapObjs(&pSoldier->inv[SECONDHANDPOS], &pSoldier->inv[bPocket]);
+			}
 			return(TRUE);
 		}
 	}