diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index f8485d7c..f0c718ce 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -85,8 +85,7 @@ BOOLEAN IsIMPSlotFree(INT32 iIMPId) { if ((iIMPId >= 0) && (iIMPId < NUM_PROFILES) && (iIMPId != NO_PROFILE) && ( gMercProfiles[iIMPId].Type == PROFILETYPE_IMP ) && - ((wcscmp(gMercProfiles[iIMPId].zName, L"") == 0) || - (gMercProfiles[iIMPId].bMercStatus == MERC_IS_DEAD) || (gMercProfiles[iIMPId].bMercStatus == MERC_FIRED_AS_A_POW))) + (wcscmp(gMercProfiles[iIMPId].zName, L"") == 0)) { return TRUE; } diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 18e812c3..19c13977 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -1074,7 +1074,7 @@ BOOLEAN StrategicRemoveMerc( SOLDIERTYPE *pSoldier ) // WDS: This allows for replacing dead IMP mercs. See "BtnIMPBeginScreenDoneCallback" in "IMP Begin Screen.cpp" if( ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__PLAYER_CHARACTER ) && - ( gMercProfiles[ pSoldier->ubProfile ].bMercStatus == MERC_IS_DEAD ) ) { + (( gMercProfiles[ pSoldier->ubProfile ].bMercStatus == MERC_IS_DEAD ) || (gMercProfiles[pSoldier->ubProfile].bMercStatus == MERC_FIRED_AS_A_POW))) { // Replace the name with an empty string wcsncpy( gMercProfiles[ pSoldier->ubProfile ].zName, L"", 1 ); }