Mercurial > mm7

comparison mm7_5.cpp @ 984:d982fffb8b96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CharacterUI_InventoryTab_Draw cleaned.
author Nomad
date Sat, 11 May 2013 17:56:12 +0200
parents 1462a5f12b65
children 9e132060ada3 c5d8ea1e6ccb
comparison
equal deleted inserted replaced
983:1462a5f12b65 984:d982fffb8b96
1034 dword_50C9D8 = 0; 1034 dword_50C9D8 = 0;
1035 } 1035 }
1036 if ( ptr_50C9A4 && ptr_50C9A4->uItemID ) 1036 if ( ptr_50C9A4 && ptr_50C9A4->uItemID )
1037 { 1037 {
1038 LOBYTE(ptr_50C9A4->uAttributes) &= 0xFu; 1038 LOBYTE(ptr_50C9A4->uAttributes) &= 0xFu;
1039 dword_50C9A8 = 0; 1039 _50C9A8_item_enchantment_timer = 0;
1040 ptr_50C9A4 = 0; 1040 ptr_50C9A4 = 0;
1041 } 1041 }
1042 if ( pGUIWindow_Settings ) 1042 if ( pGUIWindow_Settings )
1043 { 1043 {
1044 if ( pCurrentScreen == SCREEN_CHARACTERS ) 1044 if ( pCurrentScreen == SCREEN_CHARACTERS )
10280 } 10280 }
10281 else if ( pCurrentScreen == SCREEN_F ) 10281 else if ( pCurrentScreen == SCREEN_F )
10282 { 10282 {
10283 pRenderer->ClearZBuffer(0, 479); 10283 pRenderer->ClearZBuffer(0, 479);
10284 draw_leather(); 10284 draw_leather();
10285 CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); 10285 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true);
10286 pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uExitCancelTextureId)); 10286 pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uExitCancelTextureId));
10287 } 10287 }
10288 continue; 10288 continue;
10289 } 10289 }
10290 case WINDOW_SaveLoadButtons: 10290 case WINDOW_SaveLoadButtons:
10328 } 10328 }
10329 case WINDOW_CastSpell_InInventory: 10329 case WINDOW_CastSpell_InInventory:
10330 { 10330 {
10331 pRenderer->ClearZBuffer(0, 479); 10331 pRenderer->ClearZBuffer(0, 479);
10332 draw_leather(); 10332 draw_leather();
10333 CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); 10333 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true);
10334 CharacterUI_DrawPaperdoll(uActiveCharacter); 10334 CharacterUI_DrawPaperdoll(uActiveCharacter);
10335 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u)); 10335 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u));
10336 continue; 10336 continue;
10337 } 10337 }
10338 case WINDOW_FinalWindow: 10338 case WINDOW_FinalWindow:
10779 LODWORD(v32) = pOut.y; 10779 LODWORD(v32) = pOut.y;
10780 LOBYTE(v32) = LOBYTE(pOut.y) | 0x18; 10780 LOBYTE(v32) = LOBYTE(pOut.y) | 0x18;
10781 HIDWORD(v27->uExpireTime) = HIDWORD(v32); 10781 HIDWORD(v27->uExpireTime) = HIDWORD(v32);
10782 v27->uAttributes = v32; 10782 v27->uAttributes = v32;
10783 } 10783 }
10784 dword_50C9A8 = 256; 10784 _50C9A8_item_enchantment_timer = 256;
10785 goto LABEL_92; 10785 goto LABEL_92;
10786 } 10786 }
10787 v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01; 10787 v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01;
10788 if ( v36 < 0.0 ) 10788 if ( v36 < 0.0 )
10789 v36 = 0.0; 10789 v36 = 0.0;