Mercurial > mm7

comparison mm7_4.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 f16ac5e65438
children 922a96fdcc86
comparison
equal deleted inserted replaced
306:e33f5a1cdc46 315:2a09e1d6fc8f
5176 if ( a5 == 3 ) 5176 if ( a5 == 3 )
5177 { 5177 {
5178 v35 = *v26; 5178 v35 = *v26;
5179 v36 = a3->GetValue(); 5179 v36 = a3->GetValue();
5180 v29 = pPlayer->_4B8102(v36, v35); 5180 v29 = pPlayer->_4B8102(v36, v35);
5181 if ( a3->uAttributes & 2 ) 5181 if (a3->Broken())
5182 v29 = 1; 5182 v29 = 1;
5183 goto _continue_sprintf; 5183 goto _continue_sprintf;
5184 } 5184 }
5185 if ( a5 != 4 ) 5185 if ( a5 != 4 )
5186 { 5186 {
5195 if ( a5 == 6 ) 5195 if ( a5 == 6 )
5196 { 5196 {
5197 v30 = *v26; 5197 v30 = *v26;
5198 v31 = a3->GetValue(); 5198 v31 = a3->GetValue();
5199 v29 = pPlayer->_4B8102(v31, v30) / 2; 5199 v29 = pPlayer->_4B8102(v31, v30) / 2;
5200 if ( a3->uAttributes & 2 ) 5200 if (a3->Broken())
5201 v29 = 1; 5201 v29 = 1;
5202 if (!v29) 5202 if (!v29)
5203 v29 = 1; 5203 v29 = 1;
5204 goto _continue_sprintf; 5204 goto _continue_sprintf;
5205 } 5205 }
6095 } 6095 }
6096 6096
6097 for (uint k = 0; k < 138; k++) 6097 for (uint k = 0; k < 138; k++)
6098 { 6098 {
6099 if (&player->pInventoryItems[k]) 6099 if (&player->pInventoryItems[k])
6100 player->pInventoryItems[k].uAttributes |= 1; 6100 player->pInventoryItems[k].SetIdentified();
6101 } 6101 }
6102 } 6102 }
6103 } 6103 }
6104 6104
6105 pAudioPlayer->StopChannels(-1, -1); 6105 pAudioPlayer->StopChannels(-1, -1);
12813 v2 = p2DEvents[a2 - 1].uType; 12813 v2 = p2DEvents[a2 - 1].uType;
12814 v3 = a1->uItemID; 12814 v3 = a1->uItemID;
12815 v4 = a1->uItemID; 12815 v4 = a1->uItemID;
12816 v5 = pItemsTable->pItems[v4].uEquipType; 12816 v5 = pItemsTable->pItems[v4].uEquipType;
12817 if ( (v2 != 4 || (signed int)v3 < 740 || (signed int)v3 > 771) 12817 if ( (v2 != 4 || (signed int)v3 < 740 || (signed int)v3 > 771)
12818 && ((signed int)v3 >= 600 || (signed int)v3 >= 529 && (signed int)v3 <= 599) 12818 && ((signed int)v3 >= 600 || (signed int)v3 >= 529 && (signed int)v3 <= 599) || a1->Stolen())
12819 || BYTE1(a1->uAttributes) & 1 )
12820 return 0; 12819 return 0;
12821 v6 = v2 - 1; 12820 v6 = v2 - 1;
12822 if ( !v6 ) 12821 if ( !v6 )
12823 { 12822 {
12824 v11 = __OFSUB__(v5, 2); 12823 v11 = __OFSUB__(v5, 2);