diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 27ea4fe5..9869d5fc 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -5500,6 +5500,11 @@ void HandleRemovalOfAllTroopsAmongstSectors( void ) SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ GREEN_MILITIA ] = 0; SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ REGULAR_MILITIA ] = 0; SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ ELITE_MILITIA ] = 0; + + if( sSectorX == gWorldSectorX && sSectorY == gWorldSectorY ) + { + gfStrategicMilitiaChangesMade = TRUE; + } } } diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index d0b00b28..714edaa3 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -6613,13 +6613,14 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj ) else if (IsSlotAnLBESlot(bPos) == true && Item[pObj->usItem].usItemClass == IC_LBEGEAR) { - /*CHRISL: If we're trying to swap LBE items between IC pockets, we have to be careful that items are moved - into active pockets or that an LBENODE is properly created.*/ + /* Buggler: Code commented due to weird results when swapping filled LBE items that has pockets of the same size + //CHRISL: If we're trying to swap LBE items between IC pockets, we have to be careful that items are moved + into active pockets or that an LBENODE is properly created. if(pObj->HasAnyActiveLBEs(pSoldier) == false && !(_KeyDown(SHIFT))){ std::vector LBESlots; GetLBESlots(bPos, LBESlots); MoveItemsToActivePockets(pSoldier, LBESlots, bPos, pObj); - } + }*/ pInSlot->MoveThisObjectTo(gTempObject, -1, pSoldier, bPos); pObj->MoveThisObjectTo(*pInSlot, -1, pSoldier, bPos); //CHRISL: We need to make sure there are no items left in pObj or we'll lose them diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index f7548021..681e9928 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -15231,7 +15231,7 @@ BOOLEAN SOLDIERTYPE::LooksLikeACivilian( void ) checkslot = VESTPOCKPOS; break; case 4: - if ( bLoop == 23 || bLoop == 35 || bLoop == 36 || bLoop == 37 || bLoop == 38 ) + if ( bLoop == MEDPOCK3POS || bLoop == SMALLPOCK11POS || bLoop == SMALLPOCK12POS || bLoop == SMALLPOCK13POS || bLoop == SMALLPOCK14POS ) checkslot = LTHIGHPOCKPOS; else checkslot = RTHIGHPOCKPOS; @@ -15410,7 +15410,7 @@ BOOLEAN SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook ) checkslot = VESTPOCKPOS; break; case 4: - if ( bLoop == 23 || bLoop == 35 || bLoop == 36 || bLoop == 37 || bLoop == 38 ) + if ( bLoop == MEDPOCK3POS || bLoop == SMALLPOCK11POS || bLoop == SMALLPOCK12POS || bLoop == SMALLPOCK13POS || bLoop == SMALLPOCK14POS ) checkslot = LTHIGHPOCKPOS; else checkslot = RTHIGHPOCKPOS;