Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Player.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/Player.cpp	Fri May 24 08:17:50 2013 +0400
@@ -5221,8 +5221,8 @@
           if ((v28 < 0) || v28 > 2 )
               return v5 + v62 + v61;
         }
-      v15 = pItemsTable->pItems[v29].uDamageMod;
-      v14 = pItemsTable->pItems[v29].uDamageDice * pItemsTable->pItems[v29].uDamageRoll;
+      v15 = pItemsTable->pItems[v23].uDamageMod;
+      v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll;
       v5 += v15 + v14;
       return v5 + v62 + v61;
     }