Mercurial > mm7

comparison Player.cpp @ 727:da130dd3092a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Big time Travel ouverhaul
author Nomad
date Fri, 22 Mar 2013 00:02:31 +0200
parents 735dab8d3c9a
children 9f596a163257
comparison
equal deleted inserted replaced
710:735dab8d3c9a 727:da130dd3092a
3380 3380
3381 if ( a2 >= 16 ) 3381 if ( a2 >= 16 )
3382 { 3382 {
3383 v6 = 0; 3383 v6 = 0;
3384 while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6) 3384 while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6)
3385 || *(int *)&this->pInventoryItems[a2-1].uItemID != a1 ) 3385 || *(int *)&this->pInventoryItems[pEquipment.pIndices[v6] - 1].uItemID != a1 )
3386 { 3386 {
3387 ++v6; 3387 ++v6;
3388 if ( (signed int)v6 >= 16 ) 3388 if ( (signed int)v6 >= 16 )
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) && pInventoryItems[pEquipment.pIndices[a2 - 1]].uItemID == a1 )
3394 && *(int *)&this->pInventoryItems[*(&this->pEquipment.uOffHand + v3)-1] == a1 )
3395 return 1; 3394 return 1;
3396 return 0; 3395 return 0;
3397 } 3396 }
3398 3397
3399 //----- (0048D76C) -------------------------------------------------------- 3398 //----- (0048D76C) --------------------------------------------------------