mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Allowed moving items between mercs in map screen during combat for mercs that are not in the sector where battle is occurring (by Shadooow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2457,13 +2457,6 @@ BOOLEAN MapscreenCanPassItemToCharNum( INT32 iNewCharSlot )
|
||||
// assumes we're holding an item
|
||||
Assert( ( gMPanelRegion.Cursor == EXTERN_CURSOR ) || gpItemPointer || fMapInventoryItem );
|
||||
|
||||
|
||||
// if in a hostile sector, disallow
|
||||
if ( gTacticalStatus.fEnemyInSector )
|
||||
{
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
// can't pass items to nobody!
|
||||
if ( iNewCharSlot == -1 )
|
||||
{
|
||||
@@ -2473,6 +2466,11 @@ BOOLEAN MapscreenCanPassItemToCharNum( INT32 iNewCharSlot )
|
||||
|
||||
pNewSoldier = MercPtrs[ gCharactersList[ iNewCharSlot ].usSolID ];
|
||||
|
||||
// if in a hostile sector, disallow
|
||||
if (gTacticalStatus.fEnemyInSector && pNewSoldier->bInSector)
|
||||
{
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
// if showing sector inventory, and the item came from there
|
||||
if ( fShowMapInventoryPool && !gpItemPointerSoldier && fMapInventoryItem )
|
||||
|
||||
Reference in New Issue
Block a user