BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2011-06-09 16:43:02 +00:00
parent 7ddd54134f
commit a9a88e4642
2 changed files with 15 additions and 1 deletions
+13 -1
View File
@@ -8026,14 +8026,26 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject )
if (iModifier[cnt2] > 0)
{
SetFontForeground( ITEMDESC_FONTPOSITIVE );
swprintf( pStr, L"+%d", iModifier[cnt2] );
swprintf( pStr, L"%d", iModifier[cnt2] );
wcscat( pStr, L"%" );
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY);
#ifdef CHINESE
wcscat( pStr, ChineseSpecString1 );
#else
wcscat( pStr, L"%" );
#endif
}
else if (iModifier[cnt2] < 0)
{
SetFontForeground( ITEMDESC_FONTNEGATIVE );
swprintf( pStr, L"%d", iModifier[cnt2] );
wcscat( pStr, L"%" );
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY);
#ifdef CHINESE
wcscat( pStr, ChineseSpecString1 );
#else
wcscat( pStr, L"%" );
#endif
}
else
{
+2
View File
@@ -9041,6 +9041,8 @@ INT16 GetRangeBonus( OBJECTTYPE * pObj )
{
INT16 bonus = 0;
if (pObj->exists() == true) {
if(Item[pObj->usItem].usItemClass == IC_AMMO)
return( Item[pObj->usItem].rangebonus );
bonus = BonusReduce( Item[pObj->usItem].rangebonus, (*pObj)[0]->data.objectStatus );
if ( (*pObj)[0]->data.gun.ubGunShotsLeft > 0 )