Mercurial > mm7

comparison mm7_6.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 cc8e4dc397ec
children 5a66be213cff
comparison
equal deleted inserted replaced
306:e33f5a1cdc46 315:2a09e1d6fc8f
4009 v730c = &pParty->pPlayers[v3->uPlayerID_2].pInventoryItems[a2]; 4009 v730c = &pParty->pPlayers[v3->uPlayerID_2].pInventoryItems[a2];
4010 v726 = (Player *)&pItemsTable->pItems[v730c->uItemID].pIconName; 4010 v726 = (Player *)&pItemsTable->pItems[v730c->uItemID].pIconName;
4011 v730c->UpdateTempBonus(pParty->uTimePlayed); 4011 v730c->UpdateTempBonus(pParty->uTimePlayed);
4012 if ( v730c->uItemID < 64 || v730c->uItemID > 65 ) 4012 if ( v730c->uItemID < 64 || v730c->uItemID > 65 )
4013 { 4013 {
4014 if ( !(v730c->uAttributes & 2) ) 4014 if (!v730c->Broken())
4015 { 4015 {
4016 if ( v730c->uAdditionalValue == v1 ) 4016 if ( v730c->uAdditionalValue == v1 )
4017 { 4017 {
4018 if ( v730c->_bonus_type == v1 ) 4018 if ( v730c->_bonus_type == v1 )
4019 { 4019 {
5423 if ( v731 != 4 5423 if ( v731 != 4
5424 || (v245 = (int)&v726->pInventoryItems[a2], v246 = *(int *)v245, *(int *)v245 > 134) 5424 || (v245 = (int)&v726->pInventoryItems[a2], v246 = *(int *)v245, *(int *)v245 > 134)
5425 || v726->pInventoryItems[a2].uAdditionalValue != v1 5425 || v726->pInventoryItems[a2].uAdditionalValue != v1
5426 || v726->pInventoryItems[a2]._bonus_type != v1 5426 || v726->pInventoryItems[a2]._bonus_type != v1
5427 || v726->pInventoryItems[a2]._bonus_strength != v1 5427 || v726->pInventoryItems[a2]._bonus_strength != v1
5428 || (_this = (ItemGen *)((char *)&v726->pInventoryItems[a2] + 20), v726->pInventoryItems[a2].uAttributes & 2) ) 5428 || (_this = (ItemGen *)((char *)&v726->pInventoryItems[a2] + 20), v726->pInventoryItems[a2].Broken()) )
5429 goto LABEL_616; 5429 goto LABEL_616;
5430 v247 = (char *)&pItemsTable->pItems[v246].pIconName; 5430 v247 = (char *)&pItemsTable->pItems[v246].pIconName;
5431 LODWORD(v725) = (int)v247; 5431 LODWORD(v725) = (int)v247;
5432 v248 = v247[28]; 5432 v248 = v247[28];
5433 if ( v248 && v248 != 1 && v248 != 2 ) 5433 if ( v248 && v248 != 1 && v248 != 2 )
5531 || _this->_bonus_type != v1 5531 || _this->_bonus_type != v1
5532 || _this->_bonus_strength != v1 5532 || _this->_bonus_strength != v1
5533 || (v291 = pItemsTable->pItems[v290].uEquipType) == 0 5533 || (v291 = pItemsTable->pItems[v290].uEquipType) == 0
5534 || v291 == 1 5534 || v291 == 1
5535 || v291 == 2 5535 || v291 == 2
5536 || _this->uAttributes & 2 ) 5536 || _this->Broken())
5537 goto LABEL_616; 5537 goto LABEL_616;
5538 if ( _this->GetValue() < 0x1C2 ) 5538 if ( _this->GetValue() < 0x1C2 )
5539 uRequiredMana = 1; 5539 uRequiredMana = 1;
5540 if ( rand() % 100 >= SHIDWORD(v733) ) 5540 if ( rand() % 100 >= SHIDWORD(v733) )
5541 uRequiredMana = 1; 5541 uRequiredMana = 1;