Mercurial > mm7

comparison mm7_6.cpp @ 232:c879446b4a22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inventory indexing fixed
author zipi
date Sun, 17 Feb 2013 15:04:56 +0100
parents 9917d3b4925e
children a6a8fa73b4ec
comparison
equal deleted inserted replaced
231:a69fc44061d5 232:c879446b4a22
8014 if ( v32 ) 8014 if ( v32 )
8015 { 8015 {
8016 v12 = v1->pEquipment.uMainHand; 8016 v12 = v1->pEquipment.uMainHand;
8017 v29 = 1; 8017 v29 = 1;
8018 _42777D_CastSpell_UseWand_ShootArrow( 8018 _42777D_CastSpell_UseWand_ShootArrow(
8019 *((int *)&pSpellDatas[66].field_8 + *(int *)&v1->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * v12 + 5]), 8019 *((int *)&pSpellDatas[66].field_8 + *(int *)&v1->pInventoryItems[v12-1]),
8020 v0 - 1, 8020 v0 - 1,
8021 8u, 8021 8u,
8022 0, 8022 0,
8023 v0 + 8); 8023 v0 + 8);
8024 v13 = &v1->field_1F5[36 * v1->pEquipment.uMainHand + 11]; 8024 v13 = &v1->field_1F5[36 * v1->pEquipment.uMainHand + 11];
8037 return 1; 8037 return 1;
8038 if ( v28 == v3 ) 8038 if ( v28 == v3 )
8039 { 8039 {
8040 v15 = v1->pEquipment.uMainHand; 8040 v15 = v1->pEquipment.uMainHand;
8041 if ( v1->HasItemEquipped(EQUIP_TWO_HANDED) ) 8041 if ( v1->HasItemEquipped(EQUIP_TWO_HANDED) )
8042 v34 = pItemsTable->pItems[*(int *)&v1->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * v15 + 5]].uSkillType; 8042 v34 = pItemsTable->pItems[*(int *)&v1->pInventoryItems[v15-1]].uSkillType;
8043 pTurnEngine->_40471C(); 8043 pTurnEngine->_40471C();
8044 } 8044 }
8045 else 8045 else
8046 { 8046 {
8047 v34 = 7; 8047 v34 = 7;