- new icon for ammo belt and ammo vest

- mercs can refuse to eat if they do not like the food (works only once)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-07-25 00:05:01 +00:00
parent 2cef09b50b
commit 36055d4e4f
15 changed files with 110 additions and 16 deletions
+35 -1
View File
@@ -2484,6 +2484,25 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
cnt++;
}
}
//////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding )
{
if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) )
{
swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 28 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 28 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr );
MSYS_EnableRegion( &gUDBFasthelpRegions[ iFirstDataRegion + cnt ] );
cnt++;
}
else if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT_VEST) )
{
swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 29 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 29 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr );
MSYS_EnableRegion( &gUDBFasthelpRegions[ iFirstDataRegion + cnt ] );
cnt++;
}
}
}
//////////////////////////////////////////////////////
@@ -5476,7 +5495,7 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
cnt++;
}
//////////////////// drinkable WATER
//////////////////// FOOD
UINT32 foodtype = Item[gpItemDescObject->usItem].foodtype;
if ( foodtype > 0 )
{
@@ -5492,6 +5511,21 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
cnt++;
}
}
//////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding )
{
if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) )
{
BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
cnt++;
}
else if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT_VEST) )
{
BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 29, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
cnt++;
}
}
}
void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )