Mercurial > mm7
comparison Items.cpp @ 436:4a42c2f97aa2
some itemgen crashes fixed
author | Gloval |
---|---|
date | Sun, 24 Feb 2013 10:13:00 +0400 |
parents | b509ef97807a |
children | 197461e5acec |
comparison
equal
deleted
inserted
replaced
435:4f451a616d3d | 436:4a42c2f97aa2 |
---|---|
1645 } | 1645 } |
1646 v20 = pItems[out_item->uItemID].uEquipType; | 1646 v20 = pItems[out_item->uItemID].uEquipType; |
1647 if ( v20 <= EQUIP_BOW ) | 1647 if ( v20 <= EQUIP_BOW ) |
1648 { | 1648 { |
1649 v37 = v5->uBonusChanceWpSpecial[v54]; | 1649 v37 = v5->uBonusChanceWpSpecial[v54]; |
1650 if ( !*(unsigned int *)v37 ) | 1650 if ( !v37 ) |
1651 return; | 1651 return; |
1652 v38 = rand() % 100; | 1652 v38 = rand() % 100; |
1653 v36 = __OFSUB__(v38, *(unsigned int *)v37); | 1653 v36 = __OFSUB__(v38, v37); |
1654 v35 = v38 - *(unsigned int *)v37 < 0; | 1654 v35 = v38 - v37 < 0; |
1655 } | 1655 } |
1656 else | 1656 else |
1657 { | 1657 { |
1658 if ( v20 > EQUIP_AMULET ) | 1658 if ( v20 > EQUIP_AMULET ) |
1659 { | 1659 { |
1663 out_item->uNumCharges = v21; | 1663 out_item->uNumCharges = v21; |
1664 out_item->uMaxCharges = v21; | 1664 out_item->uMaxCharges = v21; |
1665 } | 1665 } |
1666 return; | 1666 return; |
1667 } | 1667 } |
1668 v22 = (int)&uBonusChanceStandart[v6]; | 1668 v22 = uBonusChanceStandart[v6]; |
1669 if ( !*(unsigned int *)v22 ) | 1669 if ( !v22 ) |
1670 return; | 1670 return; |
1671 v24 = *(unsigned int *)v22; | 1671 v24 = v22; |
1672 v25 = rand() % 100; | 1672 v25 = rand() % 100; |
1673 if ( !uBonusChanceSpecial[v6] && !(v25 < v24)) | 1673 if ( !uBonusChanceSpecial[v6] && !(v25 < v24)) |
1674 return; | 1674 return; |
1675 if ( v25 < v24 || v25 < v24) | 1675 if ( v25 < v24 || v25 < v24) |
1676 { | 1676 { |