Mercurial > mm7

comparison UI/UICharacter.cpp @ 2376:bcd7fadbf7d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents bddcaf5d5db2
children 48dbf99c0f7f
comparison
equal deleted inserted replaced
2375:14c05b876218 2376:bcd7fadbf7d2
816 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 816 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
817 if ( _50C9A8_item_enchantment_timer <= 0 ) 817 if ( _50C9A8_item_enchantment_timer <= 0 )
818 { 818 {
819 _50C9A8_item_enchantment_timer = 0; 819 _50C9A8_item_enchantment_timer = 0;
820 item->uAttributes &= 0xFFFFFF0Fu; 820 item->uAttributes &= 0xFFFFFF0Fu;
821 ptr_50C9A4_ItemToEnchant = 0; 821 ptr_50C9A4_ItemToEnchant = nullptr;
822 } 822 }
823 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE)), 823 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE)),
824 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 824 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
825 } 825 }
826 if ( !bRingsShownInCharScreen ) 826 if ( !bRingsShownInCharScreen )
860 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 860 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
861 if ( _50C9A8_item_enchantment_timer <= 0 ) 861 if ( _50C9A8_item_enchantment_timer <= 0 )
862 { 862 {
863 _50C9A8_item_enchantment_timer = 0; 863 _50C9A8_item_enchantment_timer = 0;
864 item->uAttributes &= 0xFFFFFF0Fu; 864 item->uAttributes &= 0xFFFFFF0Fu;
865 ptr_50C9A4_ItemToEnchant = 0; 865 ptr_50C9A4_ItemToEnchant = nullptr;
866 } 866 }
867 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE)), 867 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE)),
868 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 868 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
869 GetTickCount() * 0.1, 0, 255); 869 GetTickCount() * 0.1, 0, 255);
870 } 870 }
921 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 921 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
922 if ( _50C9A8_item_enchantment_timer <= 0 ) 922 if ( _50C9A8_item_enchantment_timer <= 0 )
923 { 923 {
924 _50C9A8_item_enchantment_timer = 0; 924 _50C9A8_item_enchantment_timer = 0;
925 item->uAttributes &= 0xFFFFFF0Fu; 925 item->uAttributes &= 0xFFFFFF0Fu;
926 ptr_50C9A4_ItemToEnchant = 0; 926 ptr_50C9A4_ItemToEnchant = nullptr;
927 } 927 }
928 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index]), 928 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index]),
929 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 929 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
930 } 930 }
931 if ( !bRingsShownInCharScreen ) 931 if ( !bRingsShownInCharScreen )
986 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 986 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
987 if ( _50C9A8_item_enchantment_timer <= 0 ) 987 if ( _50C9A8_item_enchantment_timer <= 0 )
988 { 988 {
989 _50C9A8_item_enchantment_timer = 0; 989 _50C9A8_item_enchantment_timer = 0;
990 item->uAttributes &= 0xFFFFFF0Fu; 990 item->uAttributes &= 0xFFFFFF0Fu;
991 ptr_50C9A4_ItemToEnchant = 0; 991 ptr_50C9A4_ItemToEnchant = nullptr;
992 } 992 }
993 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][0]), 993 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][0]),
994 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 994 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
995 } 995 }
996 996
1048 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1048 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1049 if ( _50C9A8_item_enchantment_timer <= 0 ) 1049 if ( _50C9A8_item_enchantment_timer <= 0 )
1050 { 1050 {
1051 _50C9A8_item_enchantment_timer = 0; 1051 _50C9A8_item_enchantment_timer = 0;
1052 item->uAttributes &= 0xFFFFFF0Fu; 1052 item->uAttributes &= 0xFFFFFF0Fu;
1053 ptr_50C9A4_ItemToEnchant = 0; 1053 ptr_50C9A4_ItemToEnchant = nullptr;
1054 } 1054 }
1055 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v59), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1055 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v59), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1056 GetTickCount() * 0.1, 0, 255); 1056 GetTickCount() * 0.1, 0, 255);
1057 } 1057 }
1058 if ( !bRingsShownInCharScreen ) 1058 if ( !bRingsShownInCharScreen )
1117 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1117 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1118 if ( _50C9A8_item_enchantment_timer <= 0 ) 1118 if ( _50C9A8_item_enchantment_timer <= 0 )
1119 { 1119 {
1120 _50C9A8_item_enchantment_timer = 0; 1120 _50C9A8_item_enchantment_timer = 0;
1121 item->uAttributes &= 0xFFFFFF0Fu; 1121 item->uAttributes &= 0xFFFFFF0Fu;
1122 ptr_50C9A4_ItemToEnchant = 0; 1122 ptr_50C9A4_ItemToEnchant = nullptr;
1123 } 1123 }
1124 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v75), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1124 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v75), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1125 GetTickCount() * 0.1, 0, 255); 1125 GetTickCount() * 0.1, 0, 255);
1126 } 1126 }
1127 } 1127 }
1207 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1207 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1208 if ( _50C9A8_item_enchantment_timer <= 0 ) 1208 if ( _50C9A8_item_enchantment_timer <= 0 )
1209 { 1209 {
1210 _50C9A8_item_enchantment_timer = 0; 1210 _50C9A8_item_enchantment_timer = 0;
1211 item->uAttributes &= 0xFFFFFF0Fu; 1211 item->uAttributes &= 0xFFFFFF0Fu;
1212 ptr_50C9A4_ItemToEnchant = 0; 1212 ptr_50C9A4_ItemToEnchant = nullptr;
1213 } 1213 }
1214 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v94), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1214 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v94), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1215 GetTickCount() * 0.1, 0, 255); 1215 GetTickCount() * 0.1, 0, 255);
1216 } 1216 }
1217 } 1217 }
1250 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1250 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1251 if ( _50C9A8_item_enchantment_timer <= 0 ) 1251 if ( _50C9A8_item_enchantment_timer <= 0 )
1252 { 1252 {
1253 _50C9A8_item_enchantment_timer = 0; 1253 _50C9A8_item_enchantment_timer = 0;
1254 item->uAttributes &= 0xFFFFFF0Fu; 1254 item->uAttributes &= 0xFFFFFF0Fu;
1255 ptr_50C9A4_ItemToEnchant = 0; 1255 ptr_50C9A4_ItemToEnchant = nullptr;
1256 } 1256 }
1257 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1]), 1257 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1]),
1258 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 1258 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
1259 } 1259 }
1260 } 1260 }
1314 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1314 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1315 if ( _50C9A8_item_enchantment_timer <= 0 ) 1315 if ( _50C9A8_item_enchantment_timer <= 0 )
1316 { 1316 {
1317 _50C9A8_item_enchantment_timer = 0; 1317 _50C9A8_item_enchantment_timer = 0;
1318 item->uAttributes &= 0xFFFFFF0Fu; 1318 item->uAttributes &= 0xFFFFFF0Fu;
1319 ptr_50C9A4_ItemToEnchant = 0; 1319 ptr_50C9A4_ItemToEnchant = nullptr;
1320 } 1320 }
1321 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]), 1321 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]),
1322 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 1322 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
1323 } 1323 }
1324 } 1324 }
1377 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1377 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1378 if ( _50C9A8_item_enchantment_timer <= 0 ) 1378 if ( _50C9A8_item_enchantment_timer <= 0 )
1379 { 1379 {
1380 _50C9A8_item_enchantment_timer = 0; 1380 _50C9A8_item_enchantment_timer = 0;
1381 item->uAttributes &= 0xFFFFFF0Fu; 1381 item->uAttributes &= 0xFFFFFF0Fu;
1382 ptr_50C9A4_ItemToEnchant = 0; 1382 ptr_50C9A4_ItemToEnchant = nullptr;
1383 } 1383 }
1384 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v127), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1384 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v127), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1385 GetTickCount() * 0.1, 0, 255); 1385 GetTickCount() * 0.1, 0, 255);
1386 } 1386 }
1387 else 1387 else
1435 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1435 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1436 if ( _50C9A8_item_enchantment_timer <= 0 ) 1436 if ( _50C9A8_item_enchantment_timer <= 0 )
1437 { 1437 {
1438 _50C9A8_item_enchantment_timer = 0; 1438 _50C9A8_item_enchantment_timer = 0;
1439 item->uAttributes &= 0xFFFFFF0Fu; 1439 item->uAttributes &= 0xFFFFFF0Fu;
1440 ptr_50C9A4_ItemToEnchant = 0; 1440 ptr_50C9A4_ItemToEnchant = nullptr;
1441 } 1441 }
1442 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE)), 1442 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE)),
1443 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255); 1443 pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), GetTickCount() * 0.1, 0, 255);
1444 } 1444 }
1445 if ( !bRingsShownInCharScreen ) 1445 if ( !bRingsShownInCharScreen )
1507 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1507 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1508 if ( _50C9A8_item_enchantment_timer <= 0 ) 1508 if ( _50C9A8_item_enchantment_timer <= 0 )
1509 { 1509 {
1510 _50C9A8_item_enchantment_timer = 0; 1510 _50C9A8_item_enchantment_timer = 0;
1511 item->uAttributes &= 0xFFFFFF0Fu; 1511 item->uAttributes &= 0xFFFFFF0Fu;
1512 ptr_50C9A4_ItemToEnchant = 0; 1512 ptr_50C9A4_ItemToEnchant = nullptr;
1513 } 1513 }
1514 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v153), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1514 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v153), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1515 GetTickCount() * 0.1, 0, 255); 1515 GetTickCount() * 0.1, 0, 255);
1516 if ( v245 ) 1516 if ( v245 )
1517 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0], 1517 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0],
1586 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1586 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1587 if (_50C9A8_item_enchantment_timer <= 0) 1587 if (_50C9A8_item_enchantment_timer <= 0)
1588 { 1588 {
1589 _50C9A8_item_enchantment_timer = 0; 1589 _50C9A8_item_enchantment_timer = 0;
1590 LOBYTE(player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes) &= 0xF; 1590 LOBYTE(player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes) &= 0xF;
1591 ptr_50C9A4_ItemToEnchant = 0; 1591 ptr_50C9A4_ItemToEnchant = nullptr;
1592 } 1592 }
1593 1593
1594 pRenderer->DrawAura(uCellX, uCellY, pTexture, loadedTextureptr, GetTickCount() * 0.1, 0, 255); 1594 pRenderer->DrawAura(uCellX, uCellY, pTexture, loadedTextureptr, GetTickCount() * 0.1, 0, 255);
1595 ZBuffer_Fill(&pRenderer->pActiveZBuffer[v17], item_texture_id, player->pInventoryMatrix[i]); 1595 ZBuffer_Fill(&pRenderer->pActiveZBuffer[v17], item_texture_id, player->pInventoryMatrix[i]);
1596 } 1596 }
1629 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1629 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1630 if (_50C9A8_item_enchantment_timer <= 0) 1630 if (_50C9A8_item_enchantment_timer <= 0)
1631 { 1631 {
1632 _50C9A8_item_enchantment_timer = 0; 1632 _50C9A8_item_enchantment_timer = 0;
1633 item->uAttributes &= 0xFFFFFF0F; 1633 item->uAttributes &= 0xFFFFFF0F;
1634 ptr_50C9A4_ItemToEnchant = 0; 1634 ptr_50C9A4_ItemToEnchant = nullptr;
1635 } 1635 }
1636 pRenderer->DrawAura(x, y, item_texture, enchantment_texture, GetTickCount() * 0.1, 0, 255); 1636 pRenderer->DrawAura(x, y, item_texture, enchantment_texture, GetTickCount() * 0.1, 0, 255);
1637 } 1637 }
1638 else 1638 else
1639 { 1639 {