Mercurial > mm7

comparison mm7_5.cpp @ 1019:32ec62bbaa2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
player use item part cleanup
author Gloval
date Tue, 21 May 2013 01:21:10 +0400
parents a704435d3285
children 3413ad40cc88
comparison
equal deleted inserted replaced
1015:c8c5224164da 1019:32ec62bbaa2c
2818 case UIMSG_CastSpellFromBook: 2818 case UIMSG_CastSpellFromBook:
2819 if ( pTurnEngine->field_4 != 3 ) 2819 if ( pTurnEngine->field_4 != 3 )
2820 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 0, 0, 0); 2820 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 0, 0, 0);
2821 continue; 2821 continue;
2822 2822
2823 case UIMSG_92: 2823 case UIMSG_SpellScrollUse:
2824 __debugbreak(); 2824 __debugbreak();
2825 if ( pTurnEngine->field_4 != 3 ) 2825 if ( pTurnEngine->field_4 != 3 )
2826 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 133, 1, 0); 2826 _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 133, 1, 0);
2827 continue; 2827 continue;
2828 case UIMSG_SpellBookWindow: 2828 case UIMSG_SpellBookWindow:
10860 { 10860 {
10861 if ( v51 != 5 ) 10861 if ( v51 != 5 )
10862 { 10862 {
10863 v19 = v0->AddItem(-1, 0xDCu); 10863 v19 = v0->AddItem(-1, 0xDCu);
10864 if ( v19 ) 10864 if ( v19 )
10865 *(int *)&v0->field_1F5[36 * v19 + 15] = 1; 10865 // *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
10866 v0->pOwnItems[v19-1].uAttributes=ITEM_IDENTIFIED;
10866 v20 = v47 + 50 * v15; 10867 v20 = v47 + 50 * v15;
10867 v0->pInventoryItems[pOut.z].uItemID = v51; 10868 v0->pInventoryItems[pOut.z].uItemID = v51;
10868 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType 10869 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType
10869 + v0->pInventoryItems[pOut.z].uEnchantmentType) 10870 + v0->pInventoryItems[pOut.z].uEnchantmentType)
10870 / 2; 10871 / 2;
10884 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID; 10885 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
10885 else 10886 else
10886 *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType; 10887 *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType;
10887 v21 = v0->AddItem(-1, 0xDCu); 10888 v21 = v0->AddItem(-1, 0xDCu);
10888 if ( v21 ) 10889 if ( v21 )
10889 *(int *)&v0->field_1F5[36 * v21 + 15] = 1; 10890 //*(int *)&v0->field_1F5[36 * v21 + 15] = 1;
10891 v0->pOwnItems[v21-1].uAttributes=ITEM_IDENTIFIED;
10890 goto LABEL_74; 10892 goto LABEL_74;
10891 } 10893 }
10892 goto LABEL_115; 10894 goto LABEL_115;
10893 } 10895 }
10894 v0->RemoveItemAtInventoryIndex(v18); 10896 v0->RemoveItemAtInventoryIndex(v18);