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

Fix: face gear items were wrong

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-25 15:12:47 +00:00
parent 3375414e51
commit 3612cb1279
1 changed files with 214 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+15 -3
View File
@@ -1564,7 +1564,7 @@ void DoRightIcon_FaceGear( UINT32 uiRenderBuffer, FACETYPE *pFace, INT16 sFaceX,
//---------------------------------------------------------------- //----------------------------------------------------------------
void GetXYForIconPlacement( FACETYPE *pFace, UINT16 ubIndex, INT16 sFaceX, INT16 sFaceY, INT16 *psX, INT16 *psY ) void GetXYForIconPlacement( FACETYPE *pFace, UINT16 ubIndex, INT16 sFaceX, INT16 sFaceY, INT16 *psX, INT16 *psY, UINT32 usLib )
{ {
INT16 sX, sY; INT16 sX, sY;
UINT16 usWidth, usHeight; UINT16 usWidth, usHeight;
@@ -1573,7 +1573,7 @@ void GetXYForIconPlacement( FACETYPE *pFace, UINT16 ubIndex, INT16 sFaceX, INT16
// Get height, width of icon... // Get height, width of icon...
GetVideoObject( &hVObject, guiASSIGNMENTICONS ); GetVideoObject( &hVObject, usLib );
pTrav = &(hVObject->pETRLEObject[ ubIndex ] ); pTrav = &(hVObject->pETRLEObject[ ubIndex ] );
usHeight = pTrav->usHeight; usHeight = pTrav->usHeight;
usWidth = pTrav->usWidth; usWidth = pTrav->usWidth;
@@ -2121,8 +2121,19 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
} }
} }
} }
if ( fDoIcon )
{
// Find X, y for placement
GetXYForIconPlacement( pFace, sIconIndex, sFaceX, sFaceY, &sIconX, &sIconY, guiPORTRAITICONS );
BltVideoObjectFromIndex( uiRenderBuffer, guiPORTRAITICONS, sIconIndex, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL );
fDoIcon = FALSE;
bNumRightIcons++;
}
//------------------------------------end of tactical face gear----------------------------- //------------------------------------end of tactical face gear-----------------------------
{
// If blind... // If blind...
if ( MercPtrs[ pFace->ubSoldierID ]->bBlindedCounter > 0 ) if ( MercPtrs[ pFace->ubSoldierID ]->bBlindedCounter > 0 )
{ {
@@ -2302,7 +2313,7 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
if ( fDoIcon ) if ( fDoIcon )
{ {
// Find X, y for placement // Find X, y for placement
GetXYForIconPlacement( pFace, sIconIndex, sFaceX, sFaceY, &sIconX, &sIconY ); GetXYForIconPlacement( pFace, sIconIndex, sFaceX, sFaceY, &sIconX, &sIconY, guiASSIGNMENTICONS );
BltVideoObjectFromIndex( uiRenderBuffer, guiASSIGNMENTICONS, sIconIndex, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObjectFromIndex( uiRenderBuffer, guiASSIGNMENTICONS, sIconIndex, sIconX, sIconY, VO_BLT_SRCTRANSPARENCY, NULL );
// ATE: Show numbers only in mapscreen // ATE: Show numbers only in mapscreen
@@ -2334,6 +2345,7 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
} }
} }
} }
}
else else
{ {
if ( pFace->ubCharacterNum == FATHER || pFace->ubCharacterNum == MICKY ) if ( pFace->ubCharacterNum == FATHER || pFace->ubCharacterNum == MICKY )