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

Fixes (by Sevenfm):

Browse Source 
- put back AIM_VISIBILITY calculation in function "CalcNewChanceToHitGun"
- fixed possible NULL pointer condition

Added an indicator to the NCTH cursor to show aiming penalty for moving target.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2016-09-03 11:56:00 +00:00
parent 835e948735
commit cedb77bffb
3 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface.cpp
+37
View File
@@ -2423,6 +2423,7 @@ BOOLEAN DrawCTHIndicator()
// Find the shooter.
SOLDIERTYPE *pSoldier;
SOLDIERTYPE *pTarget;
GetSoldier( &pSoldier, gusSelectedSoldier );
OBJECTTYPE* pWeapon = pSoldier->GetUsedWeapon( &pSoldier->inv[ pSoldier->ubAttackingHand ] );
@@ -3300,8 +3301,44 @@ BOOLEAN DrawCTHIndicator()
NCTHCorrectMaxAperture( iAperture, iDistanceAperture, usCApertureBar );
Circ = (INT32)((iDistanceAperture * RADIANS_IN_CIRCLE) * dVerticalBias);
if(gGameSettings.fOptions[ TOPTION_CTH_CURSOR ])
{
pTarget = SimpleFindSoldier(gCTHDisplay.iTargetGridNo, gsInterfaceLevel);
// Draw movement indicator
if ( pTarget )
{
UINT16 usCApertureMove = 0;
FLOAT dMuzzleOffsetX = 0;
DOUBLE dShootingAngle = atan2( dDeltaY, dDeltaX );
CalcTargetMovementOffset( pSoldier, pTarget, pWeapon, &dMuzzleOffsetX, dShootingAngle, (INT32)iAperture );
UINT8 ubRedValues[10] = { 80, 90, 100, 120, 140, 160, 180, 200, 220, 255 };
UINT8 ubOtherValues[10] = { 80, 80, 80, 80, 80, 60, 40, 20, 0, 0 };
dMuzzleOffsetX = abs(dMuzzleOffsetX) * 10;
UINT8 ubColorIndex = 0;
for (INT16 cntX = 0; cntX < 4; ++cntX)
{
INT16 curX = iDistanceAperture + 5 + cntX * 5;
INT16 curY = -5;
ubColorIndex = __min(9, __max(0, dMuzzleOffsetX - (1 + cntX * 2)) );
usCApertureMove = Get16BPPColor( FROMRGB( ubRedValues[ubColorIndex], ubOtherValues[ubColorIndex], ubOtherValues[ubColorIndex]) );
for (INT16 cntY = 0; cntY < 5; ++cntY, ++curX, ++curY)
{
DrawCTHPixelToBuffer( ptrBuf, uiPitch, sLeft, sTop, sRight, sBottom, sStartScreenX+curX, sStartScreenY+curY+(INT16)zOffset, usCApertureMove );
DrawCTHPixelToBuffer( ptrBuf, uiPitch, sLeft, sTop, sRight, sBottom, sStartScreenX-curX, sStartScreenY+curY+(INT16)zOffset, usCApertureMove );
DrawCTHPixelToBuffer( ptrBuf, uiPitch, sLeft, sTop, sRight, sBottom, sStartScreenX+curX, sStartScreenY-curY-(INT16)zOffset, usCApertureMove );
DrawCTHPixelToBuffer( ptrBuf, uiPitch, sLeft, sTop, sRight, sBottom, sStartScreenX-curX, sStartScreenY-curY-(INT16)zOffset, usCApertureMove );
}
}
}
// Draw outer circle
for (INT32 iCurPoint = 0; iCurPoint < Circ; iCurPoint++)
{