Merged from revision: 7484

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
+2 -2
View File
@@ -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;