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

-fixed camo kit attachments contributing to overall camo % for mercs

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@406 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-04 20:35:53 +00:00
parent 5d028b3bb8
commit d8c1e4d015
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.405" }; INT16 zVersionLabel[256] = { L"Release v1.13.406" };
#endif #endif
Tactical/Items.cpp
+8 -4
View File
@@ -7213,7 +7213,8 @@ INT16 GetCamoBonus( OBJECTTYPE * pObj )
for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) 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 ); return( bns );
} }
@@ -7226,7 +7227,8 @@ INT16 GetUrbanCamoBonus( OBJECTTYPE * pObj )
for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) 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 ); return( bns );
} }
@@ -7239,7 +7241,8 @@ INT16 GetDesertCamoBonus( OBJECTTYPE * pObj )
for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) 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 ); return( bns );
} }
@@ -7252,7 +7255,8 @@ INT16 GetSnowCamoBonus( OBJECTTYPE * pObj )
for (bLoop = 0; bLoop < MAX_ATTACHMENTS; bLoop++) 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 ); return( bns );
} }