From b9c5f457216ab793c80e08ec398a2e5bb81b2775 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Sat, 3 Jun 2006 15:42:16 +0000 Subject: [PATCH] - updated aiming levels to use a % of sight range, and to allow only rifles & sniper rifles to use aiming levels > 4 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@160 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 6d69454c..a6788093 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -7121,14 +7121,14 @@ UINT8 AllowedAimingLevels(SOLDIERTYPE * pSoldier) UINT8 aimLevels = 4; OBJECTTYPE obj = pSoldier->inv[pSoldier->ubAttackingHand]; - if ( IsScoped( &obj ) ) + if ( ( Weapon[obj.usItem].ubWeaponType == GUN_RIFLE || Weapon[obj.usItem].ubWeaponType == GUN_SN_RIFLE ) && IsScoped( &obj ) ) { - if ( GetMinRangeForAimBonus(&obj) >= 60 ) // HACK: Madd: hard coded for now for testing + if ( GetMinRangeForAimBonus(&obj) >= (UINT8)(gGameExternalOptions.ubStraightSightRange * 0.3) ) // >= 30% of sight range (~4 tiles by default) { aimLevels += 2; } - if ( GetMinRangeForAimBonus(&obj) >= 90 ) // HACK: Madd: hard coded for now for testing + if ( GetMinRangeForAimBonus(&obj) >= (UINT8)(gGameExternalOptions.ubStraightSightRange * 0.6) ) // >= 60% of sight range (~9 tiles by default) { aimLevels += 2; }