From d8c1e4d015ac70df4745b9cf1284c32b7e6abce7 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 4 Aug 2006 20:35:53 +0000 Subject: [PATCH] -fixed camo kit attachments contributing to overall camo % for mercs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@406 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 2 +- Tactical/Items.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 5e18abf89..5852ec070 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.405" }; + INT16 zVersionLabel[256] = { L"Release v1.13.406" }; #endif diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 49df3a2fd..70301dec9 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -7213,7 +7213,8 @@ INT16 GetCamoBonus( OBJECTTYPE * pObj ) for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) { - bns += (INT16) (Item[pObj->usAttachItem[bLoop]].camobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); + if (!Item[pObj->usAttachItem[bLoop]].camouflagekit) + bns += (INT16) (Item[pObj->usAttachItem[bLoop]].camobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); } return( bns ); } @@ -7226,7 +7227,8 @@ INT16 GetUrbanCamoBonus( OBJECTTYPE * pObj ) for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) { - bns += (INT16) (Item[pObj->usAttachItem[bLoop]].urbanCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); + if (!Item[pObj->usAttachItem[bLoop]].camouflagekit) + bns += (INT16) (Item[pObj->usAttachItem[bLoop]].urbanCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); } return( bns ); } @@ -7239,7 +7241,8 @@ INT16 GetDesertCamoBonus( OBJECTTYPE * pObj ) for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) { - bns += (INT16) (Item[pObj->usAttachItem[bLoop]].desertCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); + if (!Item[pObj->usAttachItem[bLoop]].camouflagekit) + bns += (INT16) (Item[pObj->usAttachItem[bLoop]].desertCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); } return( bns ); } @@ -7252,7 +7255,8 @@ INT16 GetSnowCamoBonus( OBJECTTYPE * pObj ) for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) { - bns += (INT16) (Item[pObj->usAttachItem[bLoop]].snowCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); + if (!Item[pObj->usAttachItem[bLoop]].camouflagekit) + bns += (INT16) (Item[pObj->usAttachItem[bLoop]].snowCamobonus);// * (WEAPON_STATUS_MOD(pObj->bAttachStatus[bLoop]) / 100)); } return( bns ); }