Mercurial > mm7

comparison UI/UICharacter.cpp @ 2095:577c081b8019

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Thu, 12 Dec 2013 21:44:02 +0600
parents 52415f8bf7c2
children e460ca22fe8a
comparison
equal deleted inserted replaced
2094:dbd8515924da 2095:577c081b8019
790 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; 790 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY;
791 if ( item->uItemID == 64 ) //blaster 791 if ( item->uItemID == 64 ) //blaster
792 v166 = "item64v1"; 792 v166 = "item64v1";
793 else 793 else
794 v166 = item->GetIconName(); 794 v166 = item->GetIconName();
795 if ( !( item->uAttributes & 0xF0 ) ) 795 if ( !( item->uAttributes & ITEM_ENCHANT_ANIMATION ) )
796 { 796 {
797 if ( item->uAttributes & 2 ) 797 if ( item->uAttributes & ITEM_BROKEN )
798 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE))); 798 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE)));
799 else 799 else
800 { 800 {
801 if ( item->uAttributes & 1 ) 801 if ( item->uAttributes & ITEM_IDENTIFIED )
802 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE))); 802 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE)));
803 else 803 else
804 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE))); 804 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v166, TEXTURE_16BIT_PALETTE)));
805 } 805 }
806 } 806 }
807 if ( item->uAttributes & 0xF0 ) 807 if ( item->uAttributes & ITEM_ENCHANT_ANIMATION )
808 { 808 {
809 if ( ( item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 809 if ( ( item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
810 container = "sptext01"; 810 container = "sptext01";
811 if ( ( item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 811 if ( ( item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
812 container = "sp28a"; 812 container = "sp28a";
813 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 813 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
814 container = "sp30a"; 814 container = "sp30a";
815 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 815 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
816 container = "sp91a"; 816 container = "sp91a";
817 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 817 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
818 if ( _50C9A8_item_enchantment_timer <= 0 ) 818 if ( _50C9A8_item_enchantment_timer <= 0 )
819 { 819 {
820 _50C9A8_item_enchantment_timer = 0; 820 _50C9A8_item_enchantment_timer = 0;
834 if ( player->GetItem(&PlayerEquipment::uBow) ) 834 if ( player->GetItem(&PlayerEquipment::uBow) )
835 { 835 {
836 item = player->GetBowItem(); 836 item = player->GetBowItem();
837 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][2][0] - pItemsTable->pItems[item->uItemID].uEquipX; 837 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][2][0] - pItemsTable->pItems[item->uItemID].uEquipX;
838 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][2][1] - pItemsTable->pItems[item->uItemID].uEquipY; 838 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][2][1] - pItemsTable->pItems[item->uItemID].uEquipY;
839 if ( !(item->uAttributes & 0xF0) )// если не применён закл 839 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )// если не применён закл
840 { 840 {
841 if ( item->uAttributes & 2 ) 841 if ( item->uAttributes & ITEM_BROKEN )
842 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE))); 842 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE)));
843 else 843 else
844 { 844 {
845 if ( !(item->uAttributes & 1) )//не опознанный лук зелёный 845 if ( !(item->uAttributes & ITEM_IDENTIFIED) )//не опознанный лук зелёный
846 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE))); 846 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE)));
847 else // опознанный лук 847 else // опознанный лук
848 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE))); 848 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE)));
849 } 849 }
850 } 850 }
851 else 851 else
852 { 852 {
853 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 853 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
854 container = "sptext01"; 854 container = "sptext01";
855 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 855 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
856 container = "sp28a"; 856 container = "sp28a";
857 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 857 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
858 container = "sp30a"; 858 container = "sp30a";
859 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 859 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
860 container = "sp91a"; 860 container = "sp91a";
861 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 861 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
862 if ( _50C9A8_item_enchantment_timer <= 0 ) 862 if ( _50C9A8_item_enchantment_timer <= 0 )
863 { 863 {
864 _50C9A8_item_enchantment_timer = 0; 864 _50C9A8_item_enchantment_timer = 0;
900 } 900 }
901 if ( index >= 0 && index < 10 ) 901 if ( index >= 0 && index < 10 )
902 { 902 {
903 item_X = pPaperdoll_BodyX + paperdoll_Cloak[pBodyComplection][index][0]; 903 item_X = pPaperdoll_BodyX + paperdoll_Cloak[pBodyComplection][index][0];
904 item_Y = pPaperdoll_BodyY + paperdoll_Cloak[pBodyComplection][index][1]; 904 item_Y = pPaperdoll_BodyY + paperdoll_Cloak[pBodyComplection][index][1];
905 if ( !(item->uAttributes & 0xF0) ) 905 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
906 { 906 {
907 if ( item->uAttributes & 2 ) 907 if ( item->uAttributes & ITEM_BROKEN )
908 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index])); 908 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index]));
909 else 909 else
910 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index])); 910 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_texture[pBodyComplection][index]));
911 } 911 }
912 else 912 else
913 { 913 {
914 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 914 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
915 container = "sptext01"; 915 container = "sptext01";
916 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 916 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
917 container = "sp28a"; 917 container = "sp28a";
918 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 918 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
919 container = "sp30a"; 919 container = "sp30a";
920 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 920 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
921 container = "sp91a"; 921 container = "sp91a";
922 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 922 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
923 if ( _50C9A8_item_enchantment_timer <= 0 ) 923 if ( _50C9A8_item_enchantment_timer <= 0 )
924 { 924 {
925 _50C9A8_item_enchantment_timer = 0; 925 _50C9A8_item_enchantment_timer = 0;
960 } 960 }
961 if ( index >= 0 && index < 17 ) 961 if ( index >= 0 && index < 17 )
962 { 962 {
963 item_X = pPaperdoll_BodyX + paperdoll_Armor_Coord[pBodyComplection][index][0]; 963 item_X = pPaperdoll_BodyX + paperdoll_Armor_Coord[pBodyComplection][index][0];
964 item_Y = pPaperdoll_BodyY + paperdoll_Armor_Coord[pBodyComplection][index][1]; 964 item_Y = pPaperdoll_BodyY + paperdoll_Armor_Coord[pBodyComplection][index][1];
965 if ( !(item->uAttributes & 0xF0) ) 965 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
966 { 966 {
967 if ( item->uAttributes & 2 ) 967 if ( item->uAttributes & ITEM_BROKEN )
968 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][0])); 968 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][0]));
969 else 969 else
970 { 970 {
971 if ( !(item->uAttributes & 1) ) 971 if ( !(item->uAttributes & ITEM_IDENTIFIED) )
972 pRenderer->DrawTransparentGreenShade(item_X, item_Y, &pIcons_LOD->pTextures[paperdoll_armor_texture[pBodyComplection][index][0]]); 972 pRenderer->DrawTransparentGreenShade(item_X, item_Y, &pIcons_LOD->pTextures[paperdoll_armor_texture[pBodyComplection][index][0]]);
973 else 973 else
974 pRenderer->DrawTextureTransparent(item_X, item_Y, &pIcons_LOD->pTextures[paperdoll_armor_texture[pBodyComplection][index][0]]); 974 pRenderer->DrawTextureTransparent(item_X, item_Y, &pIcons_LOD->pTextures[paperdoll_armor_texture[pBodyComplection][index][0]]);
975 } 975 }
976 } 976 }
977 else 977 else
978 { 978 {
979 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 979 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
980 container = "sptext01"; 980 container = "sptext01";
981 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 981 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
982 container = "sp28a"; 982 container = "sp28a";
983 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 983 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
984 container = "sp30a"; 984 container = "sp30a";
985 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 985 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
986 container = "sp91a"; 986 container = "sp91a";
987 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 987 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
988 if ( _50C9A8_item_enchantment_timer <= 0 ) 988 if ( _50C9A8_item_enchantment_timer <= 0 )
989 { 989 {
990 _50C9A8_item_enchantment_timer = 0; 990 _50C9A8_item_enchantment_timer = 0;
1022 } 1022 }
1023 if ( index >= 0 && index < 7 ) 1023 if ( index >= 0 && index < 7 )
1024 { 1024 {
1025 item_X = pPaperdoll_BodyX + paperdoll_Boot[pBodyComplection][index][0]; 1025 item_X = pPaperdoll_BodyX + paperdoll_Boot[pBodyComplection][index][0];
1026 item_Y = pPaperdoll_BodyY + paperdoll_Boot[pBodyComplection][index][1]; 1026 item_Y = pPaperdoll_BodyY + paperdoll_Boot[pBodyComplection][index][1];
1027 if ( !(item->uAttributes & 0xF0) ) 1027 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1028 { 1028 {
1029 if ( item->uAttributes & 2 ) 1029 if ( item->uAttributes & ITEM_BROKEN )
1030 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v59)); 1030 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v59));
1031 else 1031 else
1032 { 1032 {
1033 if ( item->uAttributes & 1 ) 1033 if ( item->uAttributes & ITEM_IDENTIFIED )
1034 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v59)); 1034 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v59));
1035 else 1035 else
1036 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v59)); 1036 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v59));
1037 } 1037 }
1038 } 1038 }
1039 else 1039 else
1040 { 1040 {
1041 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1041 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1042 container = "sptext01"; 1042 container = "sptext01";
1043 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1043 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1044 container = "sp28a"; 1044 container = "sp28a";
1045 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1045 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1046 container = "sp30a"; 1046 container = "sp30a";
1047 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1047 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1048 container = "sp91a"; 1048 container = "sp91a";
1049 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1049 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1050 if ( _50C9A8_item_enchantment_timer <= 0 ) 1050 if ( _50C9A8_item_enchantment_timer <= 0 )
1051 { 1051 {
1052 _50C9A8_item_enchantment_timer = 0; 1052 _50C9A8_item_enchantment_timer = 0;
1089 item_Y = pPaperdoll_BodyY + paperdoll_Belt[pBodyComplection][index][1]; 1089 item_Y = pPaperdoll_BodyY + paperdoll_Belt[pBodyComplection][index][1];
1090 if ( IsDwarf != 1 || index == 5 ) 1090 if ( IsDwarf != 1 || index == 5 )
1091 v75 = paperdoll_belt_texture[pBodyComplection][index]; 1091 v75 = paperdoll_belt_texture[pBodyComplection][index];
1092 else 1092 else
1093 v75 = paperdoll_belt_texture[pBodyComplection - 2][index]; 1093 v75 = paperdoll_belt_texture[pBodyComplection - 2][index];
1094 if ( !(item->uAttributes & 0xF0) ) 1094 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1095 { 1095 {
1096 if ( item->uAttributes & 2 ) 1096 if ( item->uAttributes & ITEM_BROKEN )
1097 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v75)); 1097 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v75));
1098 else 1098 else
1099 { 1099 {
1100 if ( item->uAttributes & 1 ) 1100 if ( item->uAttributes & ITEM_IDENTIFIED )
1101 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v75)); 1101 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v75));
1102 else 1102 else
1103 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v75)); 1103 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v75));
1104 } 1104 }
1105 if ( !bRingsShownInCharScreen ) 1105 if ( !bRingsShownInCharScreen )
1106 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(v75), player->pEquipment.uBelt); 1106 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(v75), player->pEquipment.uBelt);
1107 } 1107 }
1108 else 1108 else
1109 { 1109 {
1110 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1110 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1111 container = "sptext01"; 1111 container = "sptext01";
1112 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1112 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1113 container = "sp28a"; 1113 container = "sp28a";
1114 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1114 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1115 container = "sp30a"; 1115 container = "sp30a";
1116 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1116 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1117 container = "sp91a"; 1117 container = "sp91a";
1118 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1118 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1119 if ( _50C9A8_item_enchantment_timer <= 0 ) 1119 if ( _50C9A8_item_enchantment_timer <= 0 )
1120 { 1120 {
1121 _50C9A8_item_enchantment_timer = 0; 1121 _50C9A8_item_enchantment_timer = 0;
1177 item_X = pPaperdoll_BodyX + paperdoll_shoulder_second_coord[pBodyComplection][index][0]; 1177 item_X = pPaperdoll_BodyX + paperdoll_shoulder_second_coord[pBodyComplection][index][0];
1178 item_Y = pPaperdoll_BodyY + paperdoll_shoulder_second_coord[pBodyComplection][index][1]; 1178 item_Y = pPaperdoll_BodyY + paperdoll_shoulder_second_coord[pBodyComplection][index][1];
1179 } 1179 }
1180 if ( v94 != pIcons_LOD->FindTextureByName("pending") ) 1180 if ( v94 != pIcons_LOD->FindTextureByName("pending") )
1181 { 1181 {
1182 if ( !(item->uAttributes & 0xF0) ) 1182 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1183 { 1183 {
1184 if ( item->uAttributes & 2 ) 1184 if ( item->uAttributes & ITEM_BROKEN )
1185 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v94)); 1185 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v94));
1186 else 1186 else
1187 { 1187 {
1188 if ( item->uAttributes & 1 ) 1188 if ( item->uAttributes & ITEM_IDENTIFIED )
1189 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v94)); 1189 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v94));
1190 else 1190 else
1191 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v94)); 1191 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v94));
1192 } 1192 }
1193 } 1193 }
1194 else 1194 else
1195 { 1195 {
1196 if ( paperdoll_armor_texture[pBodyComplection][index][2] != pIcons_LOD->FindTextureByName("pending") ) 1196 if ( paperdoll_armor_texture[pBodyComplection][index][2] != pIcons_LOD->FindTextureByName("pending") )
1197 { 1197 {
1198 if ( item->uAttributes & 0xF0 ) 1198 if ( item->uAttributes & ITEM_ENCHANT_ANIMATION )
1199 { 1199 {
1200 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1200 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1201 container = "sptext01"; 1201 container = "sptext01";
1202 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1202 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1203 container = "sp28a"; 1203 container = "sp28a";
1204 if ( ( item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1204 if ( ( item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1205 container = "sp30a"; 1205 container = "sp30a";
1206 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1206 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1207 container = "sp91a"; 1207 container = "sp91a";
1208 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1208 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1209 if ( _50C9A8_item_enchantment_timer <= 0 ) 1209 if ( _50C9A8_item_enchantment_timer <= 0 )
1210 { 1210 {
1211 _50C9A8_item_enchantment_timer = 0; 1211 _50C9A8_item_enchantment_timer = 0;
1224 //v94 = paperdoll_armor_texture[pBodyComplection][index][1]; 1224 //v94 = paperdoll_armor_texture[pBodyComplection][index][1];
1225 if ( paperdoll_armor_texture[pBodyComplection][index][1] != pIcons_LOD->FindTextureByName("pending") ) 1225 if ( paperdoll_armor_texture[pBodyComplection][index][1] != pIcons_LOD->FindTextureByName("pending") )
1226 { 1226 {
1227 item_X = pPaperdoll_BodyX + paperdoll_shoulder_coord[pBodyComplection][index][0]; 1227 item_X = pPaperdoll_BodyX + paperdoll_shoulder_coord[pBodyComplection][index][0];
1228 item_Y = pPaperdoll_BodyY + paperdoll_shoulder_coord[pBodyComplection][index][1]; 1228 item_Y = pPaperdoll_BodyY + paperdoll_shoulder_coord[pBodyComplection][index][1];
1229 if ( !(item->uAttributes & 0xF0) ) 1229 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1230 { 1230 {
1231 if ( item->uAttributes & 2 ) 1231 if ( item->uAttributes & ITEM_BROKEN )
1232 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1])); 1232 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1]));
1233 else 1233 else
1234 { 1234 {
1235 if ( item->uAttributes & 1 ) 1235 if ( item->uAttributes & ITEM_IDENTIFIED )
1236 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1])); 1236 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1]));
1237 else 1237 else
1238 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1])); 1238 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_armor_texture[pBodyComplection][index][1]));
1239 } 1239 }
1240 } 1240 }
1241 else 1241 else
1242 { 1242 {
1243 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1243 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1244 container = "sptext01"; 1244 container = "sptext01";
1245 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1245 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1246 container = "sp28a"; 1246 container = "sp28a";
1247 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1247 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1248 container = "sp30a"; 1248 container = "sp30a";
1249 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1249 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1250 container = "sp91a"; 1250 container = "sp91a";
1251 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1251 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1252 if ( _50C9A8_item_enchantment_timer <= 0 ) 1252 if ( _50C9A8_item_enchantment_timer <= 0 )
1253 { 1253 {
1254 _50C9A8_item_enchantment_timer = 0; 1254 _50C9A8_item_enchantment_timer = 0;
1290 { 1290 {
1291 item_X = pPaperdoll_BodyX + paperdoll_CloakCollar[pBodyComplection][index][0]; 1291 item_X = pPaperdoll_BodyX + paperdoll_CloakCollar[pBodyComplection][index][0];
1292 item_Y = pPaperdoll_BodyY + paperdoll_CloakCollar[pBodyComplection][index][1]; 1292 item_Y = pPaperdoll_BodyY + paperdoll_CloakCollar[pBodyComplection][index][1];
1293 if ( paperdoll_cloak_collar_texture[pBodyComplection][index] != pIcons_LOD->FindTextureByName("pending") ) 1293 if ( paperdoll_cloak_collar_texture[pBodyComplection][index] != pIcons_LOD->FindTextureByName("pending") )
1294 { 1294 {
1295 if ( !(item->uAttributes & 0xF0) ) 1295 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1296 { 1296 {
1297 if ( item->uAttributes & 2 ) 1297 if ( item->uAttributes & ITEM_BROKEN )
1298 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index])); 1298 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]));
1299 else 1299 else
1300 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index])); 1300 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]));
1301 if ( !bRingsShownInCharScreen ) 1301 if ( !bRingsShownInCharScreen )
1302 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]), 1302 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(paperdoll_cloak_collar_texture[pBodyComplection][index]),
1303 player->pEquipment.uCloak); 1303 player->pEquipment.uCloak);
1304 } 1304 }
1305 else 1305 else
1306 { 1306 {
1307 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1307 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1308 container = "sptext01"; 1308 container = "sptext01";
1309 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1309 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1310 container = "sp28a"; 1310 container = "sp28a";
1311 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1311 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1312 container = "sp30a"; 1312 container = "sp30a";
1313 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1313 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1314 container = "sp91a"; 1314 container = "sp91a";
1315 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1315 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1316 if ( _50C9A8_item_enchantment_timer <= 0 ) 1316 if ( _50C9A8_item_enchantment_timer <= 0 )
1317 { 1317 {
1318 _50C9A8_item_enchantment_timer = 0; 1318 _50C9A8_item_enchantment_timer = 0;
1363 item_Y = pPaperdoll_BodyY + paperdoll_Helm[pBodyComplection][index][1]; 1363 item_Y = pPaperdoll_BodyY + paperdoll_Helm[pBodyComplection][index][1];
1364 if ( IsDwarf != 1 || item->uItemID != 92 ) 1364 if ( IsDwarf != 1 || item->uItemID != 92 )
1365 v127 = paperdoll_helm_texture[player->GetSexByVoice()][index]; 1365 v127 = paperdoll_helm_texture[player->GetSexByVoice()][index];
1366 else 1366 else
1367 v127 = papredoll_dbrds[11]; 1367 v127 = papredoll_dbrds[11];
1368 if ( item->uAttributes & 0xF0 ) 1368 if ( item->uAttributes & ITEM_ENCHANT_ANIMATION )
1369 { 1369 {
1370 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1370 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1371 container = "sptext01"; 1371 container = "sptext01";
1372 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1372 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1373 container = "sp28a"; 1373 container = "sp28a";
1374 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1374 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1375 container = "sp30a"; 1375 container = "sp30a";
1376 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1376 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1377 container = "sp91a"; 1377 container = "sp91a";
1378 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1378 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1379 if ( _50C9A8_item_enchantment_timer <= 0 ) 1379 if ( _50C9A8_item_enchantment_timer <= 0 )
1380 { 1380 {
1381 _50C9A8_item_enchantment_timer = 0; 1381 _50C9A8_item_enchantment_timer = 0;
1385 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v127), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1385 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v127), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1386 GetTickCount() * 0.1, 0, 255); 1386 GetTickCount() * 0.1, 0, 255);
1387 } 1387 }
1388 else 1388 else
1389 { 1389 {
1390 if ( item->uAttributes & 2 ) 1390 if ( item->uAttributes & ITEM_BROKEN )
1391 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v127)); 1391 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v127));
1392 else 1392 else
1393 { 1393 {
1394 if ( item->uAttributes & 1 ) 1394 if ( item->uAttributes & ITEM_IDENTIFIED )
1395 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v127)); 1395 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v127));
1396 else 1396 else
1397 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v127)); 1397 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v127));
1398 } 1398 }
1399 } 1399 }
1409 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; 1409 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY;
1410 if ( item->uItemID == 64 ) 1410 if ( item->uItemID == 64 )
1411 v181 = "item64v1"; 1411 v181 = "item64v1";
1412 else 1412 else
1413 v181 = item->GetIconName(); 1413 v181 = item->GetIconName();
1414 if ( !(item->uAttributes & 0xF0) ) 1414 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1415 { 1415 {
1416 if ( item->uAttributes & 2 ) 1416 if ( item->uAttributes & ITEM_BROKEN )
1417 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE))); 1417 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE)));
1418 else 1418 else
1419 { 1419 {
1420 if ( item->uAttributes & 1 ) 1420 if ( item->uAttributes & ITEM_IDENTIFIED )
1421 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE))); 1421 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE)));
1422 else 1422 else
1423 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE))); 1423 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(pIcons_LOD->LoadTexture(v181, TEXTURE_16BIT_PALETTE)));
1424 } 1424 }
1425 } 1425 }
1426 else 1426 else
1427 { 1427 {
1428 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1428 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1429 container = "sptext01"; 1429 container = "sptext01";
1430 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1430 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1431 container = "sp28a"; 1431 container = "sp28a";
1432 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1432 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1433 container = "sp30a"; 1433 container = "sp30a";
1434 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1434 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1435 container = "sp91a"; 1435 container = "sp91a";
1436 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1436 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1437 if ( _50C9A8_item_enchantment_timer <= 0 ) 1437 if ( _50C9A8_item_enchantment_timer <= 0 )
1438 { 1438 {
1439 _50C9A8_item_enchantment_timer = 0; 1439 _50C9A8_item_enchantment_timer = 0;
1480 v245 = 0; 1480 v245 = 0;
1481 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][0][0] - pItemsTable->pItems[item->uItemID].uEquipX; 1481 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][0][0] - pItemsTable->pItems[item->uItemID].uEquipX;
1482 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][0][1] - pItemsTable->pItems[item->uItemID].uEquipY; 1482 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][0][1] - pItemsTable->pItems[item->uItemID].uEquipY;
1483 } 1483 }
1484 v153 = pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE); 1484 v153 = pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE);
1485 if ( !(item->uAttributes & 0xF0) ) 1485 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1486 { 1486 {
1487 if ( item->uAttributes & 2 ) 1487 if ( item->uAttributes & ITEM_BROKEN )
1488 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1488 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1489 else 1489 else
1490 { 1490 {
1491 //v160 = (char *)pIcons_LOD->GetTexture(v153); 1491 //v160 = (char *)pIcons_LOD->GetTexture(v153);
1492 if ( !(item->uAttributes & 1) ) 1492 if ( !(item->uAttributes & ITEM_IDENTIFIED) )
1493 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1493 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1494 else 1494 else
1495 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1495 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1496 } 1496 }
1497 } 1497 }
1498 else 1498 else
1499 { 1499 {
1500 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_RED ) 1500 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_RED )
1501 container = "sptext01"; 1501 container = "sptext01";
1502 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_BLUE ) 1502 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_BLUE )
1503 container = "sp28a"; 1503 container = "sp28a";
1504 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_GREEN ) 1504 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_GREEN )
1505 container = "sp30a"; 1505 container = "sp30a";
1506 if ( (item->uAttributes & 0xF0) == ITEM_AURA_EFFECT_PURPLE ) 1506 if ( (item->uAttributes & ITEM_ENCHANT_ANIMATION) == ITEM_AURA_EFFECT_PURPLE )
1507 container = "sp91a"; 1507 container = "sp91a";
1508 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed; 1508 _50C9A8_item_enchantment_timer -= pEventTimer->uTimeElapsed;
1509 if ( _50C9A8_item_enchantment_timer <= 0 ) 1509 if ( _50C9A8_item_enchantment_timer <= 0 )
1510 { 1510 {
1511 _50C9A8_item_enchantment_timer = 0; 1511 _50C9A8_item_enchantment_timer = 0;
1571 LOBYTE(v13) = v13 & 0xE0; 1571 LOBYTE(v13) = v13 & 0xE0;
1572 v15 = v13 + 32; 1572 v15 = v13 + 32;
1573 if (pTexture->uTextureHeight < 14 ) 1573 if (pTexture->uTextureHeight < 14 )
1574 pTexture->uTextureHeight = 14; 1574 pTexture->uTextureHeight = 14;
1575 v17 = uCellX + ((v15 - pTexture->uTextureWidth) >> 1) + pSRZBufferLineOffsets[uCellY + (( (int)((pTexture->uTextureHeight - 14) & 0xFFFFFFE0) - pTexture->uTextureHeight + 32) >> 1)]; //added typecast. without it the value in the brackets got cat to unsigned which messed stuff up 1575 v17 = uCellX + ((v15 - pTexture->uTextureWidth) >> 1) + pSRZBufferLineOffsets[uCellY + (( (int)((pTexture->uTextureHeight - 14) & 0xFFFFFFE0) - pTexture->uTextureHeight + 32) >> 1)]; //added typecast. without it the value in the brackets got cat to unsigned which messed stuff up
1576 if (player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes & 0xF0) 1576 if (player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes & ITEM_ENCHANT_ANIMATION)
1577 { 1577 {
1578 Texture *loadedTextureptr = nullptr; 1578 Texture *loadedTextureptr = nullptr;
1579 switch (player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes & 0xF0) 1579 switch (player->pInventoryItemList[player->pInventoryMatrix[i] - 1].uAttributes & ITEM_ENCHANT_ANIMATION)
1580 { 1580 {
1581 case ITEM_AURA_EFFECT_RED: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sptext01", TEXTURE_16BIT_PALETTE); break; 1581 case ITEM_AURA_EFFECT_RED: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sptext01", TEXTURE_16BIT_PALETTE); break;
1582 case ITEM_AURA_EFFECT_BLUE: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp28a", TEXTURE_16BIT_PALETTE); break; 1582 case ITEM_AURA_EFFECT_BLUE: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp28a", TEXTURE_16BIT_PALETTE); break;
1583 case ITEM_AURA_EFFECT_GREEN: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp30a", TEXTURE_16BIT_PALETTE); break; 1583 case ITEM_AURA_EFFECT_GREEN: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp30a", TEXTURE_16BIT_PALETTE); break;
1584 case ITEM_AURA_EFFECT_PURPLE: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp91a", TEXTURE_16BIT_PALETTE); break; 1584 case ITEM_AURA_EFFECT_PURPLE: loadedTextureptr = pIcons_LOD->LoadTexturePtr("sp91a", TEXTURE_16BIT_PALETTE); break;
1613 1613
1614 static void CharacterUI_DrawItem(int x, int y, ItemGen *item, int id) 1614 static void CharacterUI_DrawItem(int x, int y, ItemGen *item, int id)
1615 { 1615 {
1616 Texture* item_texture = pIcons_LOD->LoadTexturePtr(item->GetIconName(), TEXTURE_16BIT_PALETTE); 1616 Texture* item_texture = pIcons_LOD->LoadTexturePtr(item->GetIconName(), TEXTURE_16BIT_PALETTE);
1617 1617
1618 if (item->uAttributes & 0xF0) // enchant animation 1618 if (item->uAttributes & ITEM_ENCHANT_ANIMATION) // enchant animation
1619 { 1619 {
1620 Texture *enchantment_texture = nullptr; 1620 Texture *enchantment_texture = nullptr;
1621 switch (item->uAttributes & 0xF0) 1621 switch (item->uAttributes & ITEM_ENCHANT_ANIMATION)
1622 { 1622 {
1623 case ITEM_AURA_EFFECT_RED: enchantment_texture = pIcons_LOD->LoadTexturePtr("sptext01", TEXTURE_16BIT_PALETTE); break; 1623 case ITEM_AURA_EFFECT_RED: enchantment_texture = pIcons_LOD->LoadTexturePtr("sptext01", TEXTURE_16BIT_PALETTE); break;
1624 case ITEM_AURA_EFFECT_BLUE: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp28a", TEXTURE_16BIT_PALETTE); break; 1624 case ITEM_AURA_EFFECT_BLUE: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp28a", TEXTURE_16BIT_PALETTE); break;
1625 case ITEM_AURA_EFFECT_GREEN: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp30a", TEXTURE_16BIT_PALETTE); break; 1625 case ITEM_AURA_EFFECT_GREEN: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp30a", TEXTURE_16BIT_PALETTE); break;
1626 case ITEM_AURA_EFFECT_PURPLE: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp91a", TEXTURE_16BIT_PALETTE); break; 1626 case ITEM_AURA_EFFECT_PURPLE: enchantment_texture = pIcons_LOD->LoadTexturePtr("sp91a", TEXTURE_16BIT_PALETTE); break;