Mercurial > mm7

comparison Player.cpp @ 654:eb67721c5268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fixes
author zipi
date Tue, 12 Mar 2013 19:48:16 +0000
parents 1ff57450f090
children c10163a6d946
comparison
equal deleted inserted replaced
653:431a8b0c2bf1 654:eb67721c5268
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 *)&v4->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(&v4->pEquipment.uOffHand + v3) + 5] == a1 ) 3394 && *(int *)&this->pInventoryItems[*(&v4->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) --------------------------------------------------------
4008 v27 = &pActor->array_000234[1]; 4008 v27 = &pActor->array_000234[1];
4009 if ( pActor->array_000234[1].uItemID ) 4009 if ( pActor->array_000234[1].uItemID )
4010 goto LABEL_84; 4010 goto LABEL_84;
4011 } 4011 }
4012 v28 = v47; 4012 v28 = v47;
4013 memcpy(v27, &v5->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * v5->pInventoryIndices[v47] + 5], 0x24u); 4013 memcpy(v27, &v5->pInventoryItems[v5->pInventoryIndices[v47]-1], 0x24u);
4014 RemoveItemAtInventoryIndex(v28); 4014 RemoveItemAtInventoryIndex(v28);
4015 LABEL_79: 4015 LABEL_79:
4016 v42 = 0; 4016 v42 = 0;
4017 v37 = 0; 4017 v37 = 0;
4018 v35 = 0; 4018 v35 = 0;
7920 return true; 7920 return true;
7921 default: 7921 default:
7922 return v4 >= pValue; 7922 return v4 >= pValue;
7923 } 7923 }
7924 while ( !v3->HasItemEquipped(v26) 7924 while ( !v3->HasItemEquipped(v26)
7925 || *(int *)&v3->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v27 + 5] != pValue ) 7925 || *(int *)&v3->pInventoryItems[*(int *)v27-1] != pValue )
7926 { 7926 {
7927 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1); 7927 v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1);
7928 v27 += 4; 7928 v27 += 4;
7929 if ( (signed int)v26 >= 16 ) 7929 if ( (signed int)v26 >= 16 )
7930 return false; 7930 return false;