Mercurial > mm7

comparison Player.cpp @ 315:2a09e1d6fc8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some 0041D895 GameUI_DrawItemInfo overhaul
author Nomad
date Wed, 20 Feb 2013 01:17:13 +0200
parents b0db84628733
children e41fe9cf3613
comparison
equal deleted inserted replaced
306:e33f5a1cdc46 315:2a09e1d6fc8f
1857 LABEL_15: 1857 LABEL_15:
1858 if ( !v10 ) 1858 if ( !v10 )
1859 return result; 1859 return result;
1860 } 1860 }
1861 LABEL_16: 1861 LABEL_16:
1862 if ( BYTE1(pItem->uAttributes) & 1 ) 1862 if (pItem->Stolen())
1863 return 6; 1863 return 6;
1864 LABEL_26: 1864 LABEL_26:
1865 //v14 = &p2DEvents_minus1__20[13 * a4]; 1865 //v14 = &p2DEvents_minus1__20[13 * a4];
1866 v14 = &p2DEvents[a4 - 1].fPriceMultiplier; 1866 v14 = &p2DEvents[a4 - 1].fPriceMultiplier;
1867 v15 = *v14; 1867 v15 = *v14;
1870 if ( a5 == 3 ) 1870 if ( a5 == 3 )
1871 { 1871 {
1872 v23 = *v14; 1872 v23 = *v14;
1873 v24 = pItem->GetValue(); 1873 v24 = pItem->GetValue();
1874 v17 = v27->_4B8102(v24, v23); 1874 v17 = v27->_4B8102(v24, v23);
1875 if ( !(pItem->uAttributes & 2) ) 1875 if (!pItem->Broken())
1876 goto LABEL_39; 1876 goto LABEL_39;
1877 goto LABEL_38; 1877 goto LABEL_38;
1878 } 1878 }
1879 if ( a5 == 4 ) 1879 if ( a5 == 4 )
1880 { 1880 {
1893 if ( a5 != 6 ) 1893 if ( a5 != 6 )
1894 goto LABEL_39; 1894 goto LABEL_39;
1895 v18 = *v14; 1895 v18 = *v14;
1896 v19 = pItem->GetValue(); 1896 v19 = pItem->GetValue();
1897 v17 = v27->_4B8102(v19, v18) / 2; 1897 v17 = v27->_4B8102(v19, v18) / 2;
1898 if ( pItem->uAttributes & 2 ) 1898 if (pItem->Broken())
1899 v17 = 1; 1899 v17 = 1;
1900 if ( v17 >= 1 ) 1900 if ( v17 >= 1 )
1901 goto LABEL_39; 1901 goto LABEL_39;
1902 LABEL_38: 1902 LABEL_38:
1903 v17 = 1; 1903 v17 = 1;
2337 auto thos = this; 2337 auto thos = this;
2338 2338
2339 v20 = thos; 2339 v20 = thos;
2340 v2 = pItem->uItemID; 2340 v2 = pItem->uItemID;
2341 if ( !pItemsTable->pItems[v2].uItemID_Rep_St ) 2341 if ( !pItemsTable->pItems[v2].uItemID_Rep_St )
2342 pItem->uAttributes |= 1u; 2342 pItem->SetIdentified();
2343 ///v15 = 0; 2343 ///v15 = 0;
2344 //v16 = 1; 2344 //v16 = 1;
2345 //v18 = 3; 2345 //v18 = 3;
2346 //v17 = 2; 2346 //v17 = 2;
2347 if ( uActiveCharacter ) 2347 if ( uActiveCharacter )
3794 case 17: 3794 case 17:
3795 v12 = 0; 3795 v12 = 0;
3796 v13 = this->pInventoryItems; 3796 v13 = this->pInventoryItems;
3797 do 3797 do
3798 { 3798 {
3799 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !(v13->uAttributes & 2) ) 3799 if ( (signed int)v13->uItemID > 0 && (signed int)v13->uItemID <= 134 && !v13->Broken())
3800 v46[v4++] = v12; 3800 v46[v4++] = v12;
3801 ++v12; 3801 ++v12;
3802 ++v13; 3802 ++v13;
3803 } 3803 }
3804 while ( v12 < 138 ); 3804 while ( v12 < 138 );