mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
enhancement: in NCTH the EDB now shows the effective mag factor for a gun in the final column. This should make it easier to decide who will profit most from a scope on the gun.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -7050,6 +7050,8 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
|
||||
FLOAT iScopeMagModifier = GetHighestScopeMagnificationFactor( gpItemDescObject );
|
||||
// Get final Magnification value
|
||||
FLOAT iFinalScopeMagValue = __max( iScopeMagValue, iScopeMagModifier );
|
||||
// get the real effective mag factor for this soldier
|
||||
iFinalScopeMagValue = CalcEffectiveMagFactor(gpItemDescSoldier, iFinalScopeMagValue);
|
||||
|
||||
if( !fComparisonMode )
|
||||
{
|
||||
@@ -7074,6 +7076,8 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
|
||||
FLOAT iComparedScopeMagModifier = GetHighestScopeMagnificationFactor( gpComparedItemDescObject );
|
||||
// Get final Magnification value
|
||||
FLOAT iComparedFinalScopeMagValue = __max( iComparedScopeMagValue, iComparedScopeMagModifier );
|
||||
// get the real effective mag factor for this soldier
|
||||
iComparedFinalScopeMagValue = CalcEffectiveMagFactor(gpItemDescSoldier, iComparedFinalScopeMagValue);
|
||||
|
||||
// Print difference in base value
|
||||
DrawPropertyValueInColourFloat( iComparedScopeMagValue - iScopeMagValue, ubNumLine, 1, fComparisonMode, FALSE, TRUE );
|
||||
@@ -7092,6 +7096,9 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
|
||||
FLOAT iScopeMagModifier = GetHighestScopeMagnificationFactor( gpComparedItemDescObject );
|
||||
// Get final Magnification value
|
||||
FLOAT iFinalScopeMagValue = __max( iScopeMagValue, iScopeMagModifier );
|
||||
// get the real effective mag factor for this soldier
|
||||
iFinalScopeMagValue = CalcEffectiveMagFactor(gpItemDescSoldier, iFinalScopeMagValue);
|
||||
|
||||
// Print base value
|
||||
if( iScopeMagValue > 1.0f )
|
||||
DrawPropertyValueInColourFloat( iScopeMagValue, ubNumLine, 1, fComparisonMode, FALSE, TRUE );
|
||||
|
||||
Reference in New Issue
Block a user