Mercurial > mm7

comparison mm7_5.cpp @ 1384:b51332ab228f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed a few member variables in Player to slightly less confusing names
author Grumpy7
date Tue, 16 Jul 2013 20:51:29 +0200
parents b3ac17fd12de
children cc9a3a24d61d
comparison
equal deleted inserted replaced
1383:0a4254e80036 1384:b51332ab228f
5615 pOut.y = SkillToMastery(v8); 5615 pOut.y = SkillToMastery(v8);
5616 v10 = pOut.z; 5616 v10 = pOut.z;
5617 if ( pParty->pPickedItem.uItemID == ITEM_POTION_BOTTLE ) 5617 if ( pParty->pPickedItem.uItemID == ITEM_POTION_BOTTLE )
5618 { 5618 {
5619 LABEL_116: 5619 LABEL_116:
5620 GameUI_DrawItemInfo(&v0->pInventoryItems[v10]); 5620 GameUI_DrawItemInfo(&v0->pInventoryItemList[v10]);
5621 return; 5621 return;
5622 } 5622 }
5623 if ( (signed int)pParty->pPickedItem.uItemID < 200 5623 if ( (signed int)pParty->pPickedItem.uItemID < 200
5624 || (signed int)pParty->pPickedItem.uItemID > 219 5624 || (signed int)pParty->pPickedItem.uItemID > 219
5625 || (v11 = (int)((char *)v0 + 36 * pOut.z), *(int *)(v11 + 532) != 220) ) 5625 || (v11 = (int)((char *)v0 + 36 * pOut.z), *(int *)(v11 + 532) != 220) )
5632 if ( pParty->pPickedItem.uItemID != 236 5632 if ( pParty->pPickedItem.uItemID != 236
5633 && ((signed int)pParty->pPickedItem.uItemID < 246 || (signed int)pParty->pPickedItem.uItemID > 250) 5633 && ((signed int)pParty->pPickedItem.uItemID < 246 || (signed int)pParty->pPickedItem.uItemID > 250)
5634 && pParty->pPickedItem.uItemID != 263 5634 && pParty->pPickedItem.uItemID != 263
5635 && pParty->pPickedItem.uItemID != 233 ) 5635 && pParty->pPickedItem.uItemID != 233 )
5636 goto LABEL_116; 5636 goto LABEL_116;
5637 v27 = &v0->pInventoryItems[pOut.z]; 5637 v27 = &v0->pInventoryItemList[pOut.z];
5638 v28 = v27->uItemID; 5638 v28 = v27->uItemID;
5639 v51 = pItemsTable->pItems[v27->uItemID].uEquipType; 5639 v51 = pItemsTable->pItems[v27->uItemID].uEquipType;
5640 v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEnchantmentType); 5640 v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEnchantmentType);
5641 if ( pParty->pPickedItem.uItemID != 233 ) 5641 if ( pParty->pPickedItem.uItemID != 233 )
5642 { 5642 {
5772 goto LABEL_53; 5772 goto LABEL_53;
5773 } 5773 }
5774 LABEL_54: 5774 LABEL_54:
5775 pOut.y = 0; 5775 pOut.y = 0;
5776 pOut.x = v10 + 1; 5776 pOut.x = v10 + 1;
5777 v17 = (int)v0->pInventoryIndices; 5777 v17 = (int)v0->pInventoryMatrix;
5778 while ( *(int *)v17 != pOut.x ) 5778 while ( *(int *)v17 != pOut.x )
5779 { 5779 {
5780 ++pOut.y; 5780 ++pOut.y;
5781 v17 += 4; 5781 v17 += 4;
5782 if ( pOut.y >= 126 ) 5782 if ( pOut.y >= 126 )
5834 v19 = v0->AddItem(-1, 0xDCu); 5834 v19 = v0->AddItem(-1, 0xDCu);
5835 if ( v19 ) 5835 if ( v19 )
5836 // *(int *)&v0->field_1F5[36 * v19 + 15] = 1; 5836 // *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
5837 v0->pOwnItems[v19-1].uAttributes=ITEM_IDENTIFIED; 5837 v0->pOwnItems[v19-1].uAttributes=ITEM_IDENTIFIED;
5838 v20 = v47 + 50 * v15; 5838 v20 = v47 + 50 * v15;
5839 v0->pInventoryItems[pOut.z].uItemID = v51; 5839 v0->pInventoryItemList[pOut.z].uItemID = v51;
5840 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType 5840 v0->pInventoryItemList[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType
5841 + v0->pInventoryItems[pOut.z].uEnchantmentType) 5841 + v0->pInventoryItemList[pOut.z].uEnchantmentType)
5842 / 2; 5842 / 2;
5843 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168 + 388 5843 v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168 + 388
5844 LABEL_74: 5844 LABEL_74:
5845 v22 = (int)((char *)v0 + 36 * pOut.z); 5845 v22 = (int)((char *)v0 + 36 * pOut.z);
5846 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) ) 5846 if ( !(pItemsTable->pItems[*(int *)(v22 + 532) ].uItemID_Rep_St) )
5901 case 0xC8u: 5901 case 0xC8u:
5902 case 0xC9u: 5902 case 0xC9u:
5903 case 0xCAu: 5903 case 0xCAu:
5904 case 0xCBu: 5904 case 0xCBu:
5905 case 0xCCu: 5905 case 0xCCu:
5906 v0->pInventoryItems[pOut.z].uItemID = 222; 5906 v0->pInventoryItemList[pOut.z].uItemID = 222;
5907 break; 5907 break;
5908 case 0xCDu: 5908 case 0xCDu:
5909 case 0xCEu: 5909 case 0xCEu:
5910 case 0xCFu: 5910 case 0xCFu:
5911 case 0xD0u: 5911 case 0xD0u:
5912 case 0xD1u: 5912 case 0xD1u:
5913 v0->pInventoryItems[pOut.z].uItemID = 223; 5913 v0->pInventoryItemList[pOut.z].uItemID = 223;
5914 break; 5914 break;
5915 case 0xD2u: 5915 case 0xD2u:
5916 case 0xD3u: 5916 case 0xD3u:
5917 case 0xD4u: 5917 case 0xD4u:
5918 case 0xD5u: 5918 case 0xD5u:
5919 case 0xD6u: 5919 case 0xD6u:
5920 v0->pInventoryItems[pOut.z].uItemID = 224; 5920 v0->pInventoryItemList[pOut.z].uItemID = 224;
5921 break; 5921 break;
5922 case 0xD7u: 5922 case 0xD7u:
5923 case 0xD8u: 5923 case 0xD8u:
5924 case 0xD9u: 5924 case 0xD9u:
5925 case 0xDAu: 5925 case 0xDAu:
5926 case 0xDBu: 5926 case 0xDBu:
5927 v0->pInventoryItems[pOut.z].uItemID = 221; 5927 v0->pInventoryItemList[pOut.z].uItemID = 221;
5928 break; 5928 break;
5929 default: 5929 default:
5930 break; 5930 break;
5931 } 5931 }
5932 pMouse->RemoveHoldingItem(); 5932 pMouse->RemoveHoldingItem();