1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disabled face icons for big faces.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8762 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-02-24 10:49:51 +00:00
parent 55f1c956cc
commit 4e4a1ff0c7
1 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+45 -48
View File
@@ -1739,8 +1739,8 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
} }
} }
// sevenfm: only show for alive soldiers // sevenfm: only show for alive soldiers, no face icons for big faces
if (MercPtrs[pFace->ubSoldierID]->stats.bLife > 0) if (MercPtrs[pFace->ubSoldierID]->stats.bLife > 0 && !(pFace->uiFlags & FACE_BIGFACE))
{ {
// Check if a robot and is not controlled.... // Check if a robot and is not controlled....
if (MercPtrs[pFace->ubSoldierID]->flags.uiStatusFlags & SOLDIER_ROBOT) if (MercPtrs[pFace->ubSoldierID]->flags.uiStatusFlags & SOLDIER_ROBOT)
@@ -1885,8 +1885,7 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
} }
} }
// sevenfm: no face gear for big faces if (gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_GEAR])
if (gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_GEAR] && !(pFace->uiFlags & FACE_BIGFACE))
{ {
if (MercPtrs[pFace->ubSoldierID]->inv[HELMETPOS].usItem > 0) if (MercPtrs[pFace->ubSoldierID]->inv[HELMETPOS].usItem > 0)
{ {
@@ -2297,14 +2296,12 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
break; break;
case MOVE_EQUIPMENT: case MOVE_EQUIPMENT:
{ sIconIndex_Assignment = 15;
sIconIndex_Assignment = 15; fDoIcon_Assignment = TRUE;
fDoIcon_Assignment = TRUE;
fShowCustomText = TRUE; fShowCustomText = TRUE;
GetShortSectorString(SECTORX(pSoldier->usItemMoveSectorID), SECTORY(pSoldier->usItemMoveSectorID), sString); GetShortSectorString(SECTORX(pSoldier->usItemMoveSectorID), SECTORY(pSoldier->usItemMoveSectorID), sString);
}
break; break;
case FACILITY_INTERROGATE_PRISONERS: case FACILITY_INTERROGATE_PRISONERS:
@@ -2447,52 +2444,52 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
sIconIndex_Assignment = 2; sIconIndex_Assignment = 2;
fDoIcon_Assignment = TRUE; fDoIcon_Assignment = TRUE;
} }
}
if (fDoIcon_Assignment) if (fDoIcon_Assignment)
{
// Find x, y for placement
GetXYForIconPlacement(pFace, sIconIndex_Assignment, sFaceX, sFaceY, &sIconX, &sIconY, guiASSIGNMENTICONS);
BltVideoObjectFromIndex(uiRenderBuffer, guiASSIGNMENTICONS, sIconIndex_Assignment, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL);
// ATE: Show numbers only in mapscreen
if (fShowNumber || fShowCustomText)
{ {
if (fShowNumber) // Find x, y for placement
GetXYForIconPlacement(pFace, sIconIndex_Assignment, sFaceX, sFaceY, &sIconX, &sIconY, guiASSIGNMENTICONS);
BltVideoObjectFromIndex(uiRenderBuffer, guiASSIGNMENTICONS, sIconIndex_Assignment, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL);
// ATE: Show numbers only in mapscreen
if (fShowNumber || fShowCustomText)
{ {
if (fShowMaximum) if (fShowNumber)
{ {
swprintf(sString, L"%d/%d", sPtsAvailable, usMaximumPts); if (fShowMaximum)
} {
else swprintf(sString, L"%d/%d", sPtsAvailable, usMaximumPts);
{ }
swprintf(sString, L"%d", sPtsAvailable); else
{
swprintf(sString, L"%d", sPtsAvailable);
}
} }
SetFontDestBuffer(uiRenderBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
if (!usTextWidth)
usTextWidth = StringPixLength(sString, FONT10ARIAL);
usTextWidth += 1;
SetFont(FONT10ARIAL);
SetFontForeground(FONT_YELLOW);
SetFontBackground(FONT_BLACK);
mprintf(sFaceX + pFace->usFaceWidth - usTextWidth, (INT16)(sFaceY + 3), sString);
SetFontDestBuffer(FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
} }
SetFontDestBuffer(uiRenderBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
if (!usTextWidth)
usTextWidth = StringPixLength(sString, FONT10ARIAL);
usTextWidth += 1;
SetFont(FONT10ARIAL);
SetFontForeground(FONT_YELLOW);
SetFontBackground(FONT_BLACK);
mprintf(sFaceX + pFace->usFaceWidth - usTextWidth, (INT16)(sFaceY + 3), sString);
SetFontDestBuffer(FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
} }
} else if (fDoIcon)
else if (fDoIcon) {
{ // Find X, y for placement
// Find X, y for placement GetXYForIconPlacement(pFace, sIconIndex, sFaceX, sFaceY, &sIconX, &sIconY, guiPORTRAITICONS);
GetXYForIconPlacement(pFace, sIconIndex, sFaceX, sFaceY, &sIconX, &sIconY, guiPORTRAITICONS); BltVideoObjectFromIndex(uiRenderBuffer, guiPORTRAITICONS, sIconIndex, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL);
BltVideoObjectFromIndex(uiRenderBuffer, guiPORTRAITICONS, sIconIndex, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL);
fDoIcon = FALSE; fDoIcon = FALSE;
++bNumRightIcons; ++bNumRightIcons;
}
} }
} }
else else