mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
- bugfix: CTD when tooltip should be displayed on militia and no merc is in that sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -50,10 +50,17 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
|
|||||||
|
|
||||||
// get the distance to enemy's tile from the selected merc
|
// get the distance to enemy's tile from the selected merc
|
||||||
if ( gusSelectedSoldier != NOBODY )
|
if ( gusSelectedSoldier != NOBODY )
|
||||||
|
{
|
||||||
iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10;
|
iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10;
|
||||||
|
}
|
||||||
|
// WANNE: If we want to show the tooltip of milita and no merc is present in the sector
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
|
if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
|
||||||
{
|
{
|
||||||
for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ )
|
for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ )
|
||||||
{
|
{
|
||||||
if ( Item[MercPtrs[gusSelectedSoldier]->inv[HANDPOS].usAttachItem[cnt]].visionrangebonus > 0 )
|
if ( Item[MercPtrs[gusSelectedSoldier]->inv[HANDPOS].usAttachItem[cnt]].visionrangebonus > 0 )
|
||||||
|
|||||||
Reference in New Issue
Block a user