mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
- added current AP's to soldier tool tip
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+1
-1
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
//RELEASE BUILD VERSION
|
//RELEASE BUILD VERSION
|
||||||
INT16 zVersionLabel[256] = { L"Release v1.13.294" };
|
INT16 zVersionLabel[256] = { L"Release v1.13.295" };
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+12
-3
@@ -1480,6 +1480,7 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
|
|||||||
}
|
}
|
||||||
|
|
||||||
extern void DisplaySoldierToolTip( FASTHELPREGION *pRegion );
|
extern void DisplaySoldierToolTip( FASTHELPREGION *pRegion );
|
||||||
|
//QUOTE_SYSTEM_STRUCT soldierTTInfo;
|
||||||
|
|
||||||
void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
|
void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
|
||||||
{
|
{
|
||||||
@@ -1488,7 +1489,7 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
|
|||||||
INT16 sX, sY;
|
INT16 sX, sY;
|
||||||
INT32 iBack;
|
INT32 iBack;
|
||||||
TILE_ELEMENT TileElem;
|
TILE_ELEMENT TileElem;
|
||||||
UINT16 pStrInfo[ 250 ];
|
UINT16 pStrInfo[ 250 ], pStr2[ 350 ];
|
||||||
UINT16 *pStr;
|
UINT16 *pStr;
|
||||||
UINT16 NameStr[ 50 ];
|
UINT16 NameStr[ 50 ];
|
||||||
UINT16 usGraphicToUse = THIRDPOINTERS1;
|
UINT16 usGraphicToUse = THIRDPOINTERS1;
|
||||||
@@ -1785,14 +1786,18 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
|
|||||||
//####################################################################################################
|
//####################################################################################################
|
||||||
if(gGameExternalOptions.gfAllowSoldierToolTips)
|
if(gGameExternalOptions.gfAllowSoldierToolTips)
|
||||||
{
|
{
|
||||||
|
swprintf( (wchar_t *)pStr2, L"Current APs: %d\n", pSoldier->bActionPoints );
|
||||||
|
|
||||||
GetHelpTextForItem( (INT16*)pStrInfo, &( pSoldier->inv[ HANDPOS ] ), pSoldier );
|
GetHelpTextForItem( (INT16*)pStrInfo, &( pSoldier->inv[ HANDPOS ] ), pSoldier );
|
||||||
//SetRegionFastHelpText( &(gKeyRingPanel), pStrInfo );
|
//SetRegionFastHelpText( &(gKeyRingPanel), pStrInfo );
|
||||||
//DisplayFastHelp( &(gKeyRingPanel) );
|
//DisplayFastHelp( &(gKeyRingPanel) );
|
||||||
|
|
||||||
|
wcscat( pStr2, pStrInfo );
|
||||||
|
|
||||||
soldierToolTip[ 0 ].iX = sXPos+50;
|
soldierToolTip[ 0 ].iX = sXPos+50;
|
||||||
soldierToolTip[ 0 ].iY = sYPos+50;
|
soldierToolTip[ 0 ].iY = sYPos+50;
|
||||||
|
|
||||||
wcscpy( soldierToolTip[ 0 ].FastHelpText, pStrInfo );
|
wcscpy( soldierToolTip[ 0 ].FastHelpText, pStr2 );
|
||||||
|
|
||||||
DisplaySoldierToolTip( &( soldierToolTip[ 0 ] ) );
|
DisplaySoldierToolTip( &( soldierToolTip[ 0 ] ) );
|
||||||
}
|
}
|
||||||
@@ -1824,14 +1829,18 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
|
|||||||
//####################################################################################################
|
//####################################################################################################
|
||||||
if(gGameExternalOptions.gfAllowSoldierToolTips)
|
if(gGameExternalOptions.gfAllowSoldierToolTips)
|
||||||
{
|
{
|
||||||
|
swprintf( (wchar_t *)pStr2, L"Current APs: %d\n", pSoldier->bActionPoints );
|
||||||
|
|
||||||
GetHelpTextForItem( (INT16*)pStrInfo, &( pSoldier->inv[ HANDPOS ] ), pSoldier );
|
GetHelpTextForItem( (INT16*)pStrInfo, &( pSoldier->inv[ HANDPOS ] ), pSoldier );
|
||||||
//SetRegionFastHelpText( &(gKeyRingPanel), pStrInfo );
|
//SetRegionFastHelpText( &(gKeyRingPanel), pStrInfo );
|
||||||
//DisplayFastHelp( &(gKeyRingPanel) );
|
//DisplayFastHelp( &(gKeyRingPanel) );
|
||||||
|
|
||||||
|
wcscat( pStr2, pStrInfo );
|
||||||
|
|
||||||
soldierToolTip[ 0 ].iX = sXPos+50;
|
soldierToolTip[ 0 ].iX = sXPos+50;
|
||||||
soldierToolTip[ 0 ].iY = sYPos+50;
|
soldierToolTip[ 0 ].iY = sYPos+50;
|
||||||
|
|
||||||
wcscpy( soldierToolTip[ 0 ].FastHelpText, pStrInfo );
|
wcscpy( soldierToolTip[ 0 ].FastHelpText, pStr2 );
|
||||||
|
|
||||||
DisplaySoldierToolTip( &( soldierToolTip[ 0 ] ) );
|
DisplaySoldierToolTip( &( soldierToolTip[ 0 ] ) );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user