Mercurial > mm7
comparison Player.cpp @ 671:2bb0e9da8302
Merge
author | Gloval |
---|---|
date | Fri, 15 Mar 2013 01:52:18 +0400 |
parents | 8c6c41037c39 |
children | 735dab8d3c9a 277c05c3a89f |
comparison
equal
deleted
inserted
replaced
670:9824e2eeee30 | 671:2bb0e9da8302 |
---|---|
3389 return 0; | 3389 return 0; |
3390 } | 3390 } |
3391 return 1; | 3391 return 1; |
3392 } | 3392 } |
3393 if ( HasItemEquipped((ITEM_EQUIP_TYPE)a2) | 3393 if ( HasItemEquipped((ITEM_EQUIP_TYPE)a2) |
3394 && *(int *)&this->pInventoryItems[*(&v4->pEquipment.uOffHand + v3)-1] == a1 ) | 3394 && *(int *)&this->pInventoryItems[*(&this->pEquipment.uOffHand + v3)-1] == a1 ) |
3395 return 1; | 3395 return 1; |
3396 return 0; | 3396 return 0; |
3397 } | 3397 } |
3398 | 3398 |
3399 //----- (0048D76C) -------------------------------------------------------- | 3399 //----- (0048D76C) -------------------------------------------------------- |