- grenaded can now also be armed in the inventory like bombs

- fix: underbarrel weapons no longer influence dirt generation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-08-22 19:54:35 +00:00
parent 30e13e1e26
commit 544314276c
5 changed files with 101 additions and 40 deletions
+2 -1
View File
@@ -14385,7 +14385,8 @@ FLOAT GetItemDirtIncreaseFactor( OBJECTTYPE * pObj, BOOLEAN fConsiderAmmo )
attachmentList::iterator iterend = (*pObj)[0]->attachments.end();
for (attachmentList::iterator iter = (*pObj)[0]->attachments.begin(); iter != iterend; ++iter)
{
if (iter->exists())
// it attachment is not a weapon, add its factor
if (iter->exists() && !(Item[iter->usItem].usItemClass & IC_WEAPON) )
{
dirtincreasefactor += Item[iter->usItem].dirtIncreaseFactor;
}