1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 7484

Browse Source 
Fixes (by Buggler)
- Commented code due to weird results when swapping filled LBE items that has pockets of the same size
- Fixed militia remains in loaded sector on using Unassign All button and then not assigning any militia to the loaded sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-09-03 16:29:19 +00:00
parent f07dbef356
commit d3100e3c4e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.cpp
+5
View File
@@ -5500,6 +5500,11 @@ void HandleRemovalOfAllTroopsAmongstSectors( void )
SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ GREEN_MILITIA ] = 0; SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ GREEN_MILITIA ] = 0;
SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ REGULAR_MILITIA ] = 0; SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ REGULAR_MILITIA ] = 0;
SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ ELITE_MILITIA ] = 0; SectorInfo[ sCurrentSectorValue ].ubNumberOfCivsAtLevel[ ELITE_MILITIA ] = 0;
if( sSectorX == gWorldSectorX && sSectorY == gWorldSectorY )
{
gfStrategicMilitiaChangesMade = TRUE;
}
} }
} }
Tactical/Items.cpp
+4 -3
View File
@@ -6613,13 +6613,14 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj )
else if (IsSlotAnLBESlot(bPos) == true && Item[pObj->usItem].usItemClass == IC_LBEGEAR) 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 /* Buggler: Code commented due to weird results when swapping filled LBE items that has pockets of the same size
into active pockets or that an LBENODE is properly created.*/ //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))){ if(pObj->HasAnyActiveLBEs(pSoldier) == false && !(_KeyDown(SHIFT))){
std::vector<INT8> LBESlots; std::vector<INT8> LBESlots;
GetLBESlots(bPos, LBESlots); GetLBESlots(bPos, LBESlots);
MoveItemsToActivePockets(pSoldier, LBESlots, bPos, pObj); MoveItemsToActivePockets(pSoldier, LBESlots, bPos, pObj);
} }*/
pInSlot->MoveThisObjectTo(gTempObject, -1, pSoldier, bPos); pInSlot->MoveThisObjectTo(gTempObject, -1, pSoldier, bPos);
pObj->MoveThisObjectTo(*pInSlot, -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 //CHRISL: We need to make sure there are no items left in pObj or we'll lose them
Tactical/Soldier Control.cpp
+2 -2
View File
@@ -15231,7 +15231,7 @@ BOOLEAN SOLDIERTYPE::LooksLikeACivilian( void )
checkslot = VESTPOCKPOS; checkslot = VESTPOCKPOS;
break; break;
case 4: 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; checkslot = LTHIGHPOCKPOS;
else else
checkslot = RTHIGHPOCKPOS; checkslot = RTHIGHPOCKPOS;
@@ -15410,7 +15410,7 @@ BOOLEAN SOLDIERTYPE::EquipmentTooGood( BOOLEAN fCloselook )
checkslot = VESTPOCKPOS; checkslot = VESTPOCKPOS;
break; break;
case 4: 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; checkslot = LTHIGHPOCKPOS;
else else
checkslot = RTHIGHPOCKPOS; checkslot = RTHIGHPOCKPOS;