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

GetSoldierAboveGuyPositions:

Browse Source 
- use max value so that animation and text do not overlap
- lowered Y offset for crouched stance

DrawSelectedUIAboveGuy:
- reduce vertical gap if not showing health bars

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8805 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-05-18 06:04:34 +00:00
parent ea1892c788
commit 84afe6b160
1 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface.cpp
+17 -10
View File
@@ -1537,14 +1537,18 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
sMercScreenY -= sOffsetY; sMercScreenY -= sOffsetY;
// Adjust based on stance // Adjust based on stance
if ( ( gAnimControl[ pSoldier->usAnimState ].uiFlags & ANIM_NOMOVE_MARKER) ) /*if ((gAnimControl[pSoldier->usAnimState].uiFlags & ANIM_NOMOVE_MARKER))
{ {
ubAnimUseHeight = gAnimControl[pSoldier->usAnimState].ubHeight; ubAnimUseHeight = gAnimControl[pSoldier->usAnimState].ubHeight;
} }
else else
{ {
ubAnimUseHeight = gAnimControl[pSoldier->usAnimState].ubEndHeight; ubAnimUseHeight = gAnimControl[pSoldier->usAnimState].ubEndHeight;
} }*/
// sevenfm: use max value so that animation and health string do not overlap
ubAnimUseHeight = max(gAnimControl[pSoldier->usAnimState].ubEndHeight, gAnimControl[pSoldier->usAnimState].ubHeight);
switch (ubAnimUseHeight) switch (ubAnimUseHeight)
{ {
case ANIM_STAND: case ANIM_STAND:
@@ -1555,7 +1559,9 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
break; break;
case ANIM_CROUCH: case ANIM_CROUCH:
sStanceOffset = 10; //sStanceOffset = 10;
// sevenfm: reduce gap between animation and text
sStanceOffset = 15;
break; break;
} }
@@ -1563,15 +1569,11 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
switch (pSoldier->ubBodyType) switch (pSoldier->ubBodyType)
{ {
case CROW: case CROW:
sStanceOffset = 30; sStanceOffset = 30;
break; break;
case ROBOTNOWEAPON: case ROBOTNOWEAPON:
sStanceOffset = 30; sStanceOffset = 30;
break; break;
} }
// anv: passengers sit, but we want to display their names above vehicle // anv: passengers sit, but we want to display their names above vehicle
@@ -1605,7 +1607,7 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
*psY = sMercScreenY - sTextBodyTypeYOffset + sStanceOffset; *psY = sMercScreenY - sTextBodyTypeYOffset + sStanceOffset;
// OK, Check if we need to go below.... // OK, Check if we need to go below....
// Can do this 1) if displaying damge or 2 ) above screen // Can do this 1) if displaying damage or 2 ) above screen
// If not a radio position, adjust if we are getting hit, to be lower! // If not a radio position, adjust if we are getting hit, to be lower!
// If we are getting hit, lower them! // If we are getting hit, lower them!
@@ -1615,7 +1617,6 @@ void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT16 *psY,
*psY = sMercScreenY; *psY = sMercScreenY;
} }
} }
} }
else else
{ {
@@ -1899,6 +1900,12 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
GetSoldierAboveGuyPositions( pVehicle, &sXPos, &sYPos, FALSE ); GetSoldierAboveGuyPositions( pVehicle, &sXPos, &sYPos, FALSE );
} }
// sevenfm: reduce gap if not showing health bars
if (!gGameExternalOptions.ubShowHealthBarsOnHead)
{
sYPos += 10;
}
// Display name // Display name
SetFont( TINYFONT1 ); SetFont( TINYFONT1 );
SetFontBackground( FONT_MCOLOR_BLACK ); SetFontBackground( FONT_MCOLOR_BLACK );
@@ -3534,7 +3541,7 @@ void DrawBarsInUIBox( SOLDIERTYPE *pSoldier , INT16 sXPos, INT16 sYPos, INT16 sW
// Draw new size // Draw new size
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
// region rysowania barow nad najemnikiem // bar over merc drawing region
SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, gsVIEWPORT_WINDOW_START_Y, SCREEN_WIDTH, ( gsVIEWPORT_WINDOW_END_Y - gsVIEWPORT_WINDOW_START_Y ) ); SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, gsVIEWPORT_WINDOW_START_Y, SCREEN_WIDTH, ( gsVIEWPORT_WINDOW_END_Y - gsVIEWPORT_WINDOW_START_Y ) );
// sevenfm: draw background for alt bar // sevenfm: draw background for alt bar