Mercurial > mm7

comparison Player.cpp @ 1066:938af16d5b88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Fri, 24 May 2013 08:17:50 +0400
parents 655fde266d96 e23a79658fc5
children e32e2287d491
comparison
equal deleted inserted replaced
1065:e86b4951da70 1066:938af16d5b88
5219 5219
5220 v28 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND); 5220 v28 = v6->GetEquippedItemEquipType(EQUIP_OFF_HAND);
5221 if ((v28 < 0) || v28 > 2 ) 5221 if ((v28 < 0) || v28 > 2 )
5222 return v5 + v62 + v61; 5222 return v5 + v62 + v61;
5223 } 5223 }
5224 v15 = pItemsTable->pItems[v29].uDamageMod; 5224 v15 = pItemsTable->pItems[v23].uDamageMod;
5225 v14 = pItemsTable->pItems[v29].uDamageDice * pItemsTable->pItems[v29].uDamageRoll; 5225 v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll;
5226 v5 += v15 + v14; 5226 v5 += v15 + v14;
5227 return v5 + v62 + v61; 5227 return v5 + v62 + v61;
5228 } 5228 }
5229 v59 = 3; 5229 v59 = 3;
5230 LABEL_74: 5230 LABEL_74: