1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

New feature: Getting and using intel allows for more spy-related roleplay.

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-02-18 23:17:34 +00:00
parent ee73811cfe
commit e55b480996
83 changed files with 3784 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+43 -22
View File
@@ -1647,9 +1647,10 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
FLOAT bPtsAvailable = 0.0; // Flugente: sometimes, we want to display float values...
UINT16 usMaximumPts = 0;
CHAR16 sString[ 32 ];
UINT16 usTextWidth;
UINT16 usTextWidth = 0;
BOOLEAN fShowNumber = FALSE;
BOOLEAN fShowMaximum = FALSE;
BOOLEAN fShowCustomText = FALSE;
SOLDIERTYPE *pSoldier;
INT16 sFontX, sFontY;
INT16 sX1, sY1, sY2, sX2;
@@ -1670,9 +1671,7 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
UINT32 uiFaceTwo=0;
BOOLEAN drawOpponentCount = FALSE;
CHAR16 wShortText[ 8 ]; // added by Flugente to display sector names
// If we are using an extern buffer...
if ( fUseExternBuffer )
{
@@ -2375,11 +2374,10 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
{
sIconIndex_Assignment = 15;
fDoIcon_Assignment = TRUE;
GetShortSectorString( SECTORX(pSoldier->usItemMoveSectorID), SECTORY(pSoldier->usItemMoveSectorID), wShortText );
fShowNumber = TRUE;
fShowMaximum = TRUE;
fShowCustomText = TRUE;
GetShortSectorString( SECTORX(pSoldier->usItemMoveSectorID), SECTORY(pSoldier->usItemMoveSectorID), sString );
}
break;
@@ -2467,6 +2465,27 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
usMaximumPts = (INT16)(pSectorInfo->dFortification_MaxPossible);
}
}
break;
case CONCEALED:
case GATHERINTEL:
sIconIndex_Assignment = 34;
fDoIcon_Assignment = TRUE;
fShowCustomText = TRUE;
if ( pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] )
{
swprintf( sString, L"Hide %dh", pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] );
}
else
{
bPtsAvailable = MercPtrs[pFace->ubSoldierID]->GetIntelGain();
usMaximumPts = (UINT16)( MercPtrs[pFace->ubSoldierID]->GetUncoverRisk() );
swprintf( sString, L"%4.2f/%d%%%%", bPtsAvailable, usMaximumPts );
usTextWidth = StringPixLength( sString, FONT10ARIAL ) - 10;
}
break;
}
@@ -2494,30 +2513,32 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
BltVideoObjectFromIndex( uiRenderBuffer, guiASSIGNMENTICONS, sIconIndex_Assignment, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL );
// ATE: Show numbers only in mapscreen
if( fShowNumber )
if ( fShowNumber || fShowCustomText )
{
if ( fShowNumber )
{
if ( fShowMaximum )
{
swprintf( sString, L"%d/%d", sPtsAvailable, usMaximumPts );
}
else
{
swprintf( sString, L"%d", sPtsAvailable );
}
}
SetFontDestBuffer( uiRenderBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
if ( fShowMaximum )
{
if ( pSoldier->bAssignment == MOVE_EQUIPMENT )
swprintf( sString, L"%s", wShortText );
else
swprintf( sString, L"%d/%d", sPtsAvailable, usMaximumPts );
}
else
{
swprintf( sString, L"%d", sPtsAvailable );
}
if ( !usTextWidth )
usTextWidth = StringPixLength( sString, FONT10ARIAL );
usTextWidth = StringPixLength( sString, FONT10ARIAL );
usTextWidth += 1;
SetFont( FONT10ARIAL );
SetFontForeground( FONT_YELLOW );
SetFontBackground( FONT_BLACK );
mprintf( sFaceX + pFace->usFaceWidth - usTextWidth, ( INT16 )( sFaceY + 3 ), sString );
mprintf( sFaceX + pFace->usFaceWidth - usTextWidth, (INT16)( sFaceY + 3 ), sString );
SetFontDestBuffer( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
}
}