Skip to content

Commit 152ecdb

Browse files
DeltaGW2DeltaGW2
committed
Fix wrong spec/prof icon lookup.
1 parent feeed32 commit 152ecdb

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

‎src/Util.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,58 +91,58 @@ inline void RenderSpecIcon(float aSize, int aProfession, int aSpec)
9191
switch (aProfession)
9292
{
9393
case 1: // Guardian
94-
if (aSpec == -1) entry = { ETextures::SpecGrd, "TEX_SPEC_GRD", "Guardian", IDB_SPEC_GRD };
95-
else if (aSpec == 13) entry = { ETextures::SpecGrdDgh, "TEX_SPEC_GRD_DGH", "Dragonhunter", IDB_SPEC_GRD_DGH };
96-
else if (aSpec == 42) entry = { ETextures::SpecGrdWbd, "TEX_SPEC_GRD_WBD", "Willbender", IDB_SPEC_GRD_WBD };
94+
if (aSpec == 27) entry = { ETextures::SpecGrdDgh, "TEX_SPEC_GRD_DGH", "Dragonhunter", IDB_SPEC_GRD_DGH };
95+
else if (aSpec == 65) entry = { ETextures::SpecGrdWbd, "TEX_SPEC_GRD_WBD", "Willbender", IDB_SPEC_GRD_WBD };
9796
else if (aSpec == 62) entry = { ETextures::SpecGrdFbd, "TEX_SPEC_GRD_FBD", "Firebrand", IDB_SPEC_GRD_FBD };
97+
else entry = { ETextures::SpecGrd, "TEX_SPEC_GRD", "Guardian", IDB_SPEC_GRD };
9898
break;
9999
case 2: // Warrior
100-
if (aSpec == -1) entry = { ETextures::SpecWar, "TEX_SPEC_WAR", "Warrior", IDB_SPEC_WAR };
101-
else if (aSpec == 18) entry = { ETextures::SpecWarBrs, "TEX_SPEC_WAR_BRS", "Berserker", IDB_SPEC_WAR_BRS };
100+
if (aSpec == 18) entry = { ETextures::SpecWarBrs, "TEX_SPEC_WAR_BRS", "Berserker", IDB_SPEC_WAR_BRS };
102101
else if (aSpec == 61) entry = { ETextures::SpecWarSpb, "TEX_SPEC_WAR_SPB", "Spellbreaker", IDB_SPEC_WAR_SPB };
103102
else if (aSpec == 68) entry = { ETextures::SpecWarBsw, "TEX_SPEC_WAR_BSW", "Bladesworn", IDB_SPEC_WAR_BSW };
103+
else entry = { ETextures::SpecWar, "TEX_SPEC_WAR", "Warrior", IDB_SPEC_WAR };
104104
break;
105105
case 3: // Engineer
106-
if (aSpec == -1) entry = { ETextures::SpecEng, "TEX_SPEC_ENG", "Engineer", IDB_SPEC_ENG };
107-
else if (aSpec == 43) entry = { ETextures::SpecEngScr, "TEX_SPEC_ENG_SCR", "Scrapper", IDB_SPEC_ENG_SCR };
106+
if (aSpec == 43) entry = { ETextures::SpecEngScr, "TEX_SPEC_ENG_SCR", "Scrapper", IDB_SPEC_ENG_SCR };
108107
else if (aSpec == 57) entry = { ETextures::SpecEngHls, "TEX_SPEC_ENG_HLS", "Holosmith", IDB_SPEC_ENG_HLS };
109108
else if (aSpec == 70) entry = { ETextures::SpecEngMch, "TEX_SPEC_ENG_MCH", "Mechanist", IDB_SPEC_ENG_MCH };
109+
else entry = { ETextures::SpecEng, "TEX_SPEC_ENG", "Engineer", IDB_SPEC_ENG };
110110
break;
111111
case 4: // Ranger
112-
if (aSpec == -1) entry = { ETextures::SpecRgr, "TEX_SPEC_RGR", "Ranger", IDB_SPEC_RGR };
113-
else if (aSpec == 55) entry = { ETextures::SpecRgrSlb, "TEX_SPEC_RGR_SLB", "Soulbeast", IDB_SPEC_RGR_SLB };
112+
if (aSpec == 55) entry = { ETextures::SpecRgrSlb, "TEX_SPEC_RGR_SLB", "Soulbeast", IDB_SPEC_RGR_SLB };
114113
else if (aSpec == 72) entry = { ETextures::SpecRgrUtd, "TEX_SPEC_RGR_UTD", "Untamed", IDB_SPEC_RGR_UTD };
115-
else if (aSpec == 25) entry = { ETextures::SpecRgrDrd, "TEX_SPEC_RGR_DRD", "Druid", IDB_SPEC_RGR_DRD };
114+
else if (aSpec == 5) entry = { ETextures::SpecRgrDrd, "TEX_SPEC_RGR_DRD", "Druid", IDB_SPEC_RGR_DRD };
115+
else entry = { ETextures::SpecRgr, "TEX_SPEC_RGR", "Ranger", IDB_SPEC_RGR };
116116
break;
117117
case 5: // Thief
118-
if (aSpec == -1) entry = { ETextures::SpecThf, "TEX_SPEC_THF", "Thief", IDB_SPEC_THF };
119-
else if (aSpec == 35) entry = { ETextures::SpecThfDde, "TEX_SPEC_THF_DDE", "Daredevil", IDB_SPEC_THF_DDE };
120-
else if (aSpec == 58) entry = { ETextures::SpecThfDdl, "TEX_SPEC_THF_DDL", "Deadeye", IDB_SPEC_THF_DDL };
118+
if (aSpec == 58) entry = { ETextures::SpecThfDde, "TEX_SPEC_THF_DDE", "Daredevil", IDB_SPEC_THF_DDE };
119+
else if (aSpec == 7) entry = { ETextures::SpecThfDdl, "TEX_SPEC_THF_DDL", "Deadeye", IDB_SPEC_THF_DDL };
121120
else if (aSpec == 71) entry = { ETextures::SpecThfSpc, "TEX_SPEC_THF_SPC", "Specter", IDB_SPEC_THF_SPC };
121+
else entry = { ETextures::SpecThf, "TEX_SPEC_THF", "Thief", IDB_SPEC_THF };
122122
break;
123123
case 6: // Elementalist
124-
if (aSpec == -1) entry = { ETextures::SpecEle, "TEX_SPEC_ELE", "Elementalist", IDB_SPEC_ELE };
125-
else if (aSpec == 48) entry = { ETextures::SpecEleTmp, "TEX_SPEC_ELE_TMP", "Tempest", IDB_SPEC_ELE_TMP };
124+
if (aSpec == 48) entry = { ETextures::SpecEleTmp, "TEX_SPEC_ELE_TMP", "Tempest", IDB_SPEC_ELE_TMP };
126125
else if (aSpec == 56) entry = { ETextures::SpecEleWvr, "TEX_SPEC_ELE_WVR", "Weaver", IDB_SPEC_ELE_WVR };
127126
else if (aSpec == 67) entry = { ETextures::SpecEleCat, "TEX_SPEC_ELE_CAT", "Catalyst", IDB_SPEC_ELE_CAT };
127+
else entry = { ETextures::SpecEle, "TEX_SPEC_ELE", "Elementalist", IDB_SPEC_ELE };
128128
break;
129129
case 7: // Mesmer
130-
if (aSpec == -1) entry = { ETextures::SpecMes, "TEX_SPEC_MES", "Mesmer", IDB_SPEC_MES };
131-
else if (aSpec == 40) entry = { ETextures::SpecMesChr, "TEX_SPEC_MES_CHR", "Chronomancer", IDB_SPEC_MES_CHR };
130+
if (aSpec == 40) entry = { ETextures::SpecMesChr, "TEX_SPEC_MES_CHR", "Chronomancer", IDB_SPEC_MES_CHR };
132131
else if (aSpec == 59) entry = { ETextures::SpecMesMir, "TEX_SPEC_MES_MIR", "Mirage", IDB_SPEC_MES_MIR };
133132
else if (aSpec == 66) entry = { ETextures::SpecMesVrt, "TEX_SPEC_MES_VRT", "Virtuoso", IDB_SPEC_MES_VRT };
133+
else entry = { ETextures::SpecMes, "TEX_SPEC_MES", "Mesmer", IDB_SPEC_MES };
134134
break;
135135
case 8: // Necromancer
136-
if (aSpec == -1) entry = { ETextures::SpecNec, "TEX_SPEC_NEC", "Necromancer", IDB_SPEC_NEC };
137-
else if (aSpec == 34) entry = { ETextures::SpecNecRpr, "TEX_SPEC_NEC_RPR", "Reaper", IDB_SPEC_NEC_RPR };
136+
if (aSpec == 34) entry = { ETextures::SpecNecRpr, "TEX_SPEC_NEC_RPR", "Reaper", IDB_SPEC_NEC_RPR };
138137
else if (aSpec == 60) entry = { ETextures::SpecNecScg, "TEX_SPEC_NEC_SCG", "Scourge", IDB_SPEC_NEC_SCG };
139138
else if (aSpec == 64) entry = { ETextures::SpecNecHrb, "TEX_SPEC_NEC_HRB", "Harbinger", IDB_SPEC_NEC_HRB };
139+
else entry = { ETextures::SpecNec, "TEX_SPEC_NEC", "Necromancer", IDB_SPEC_NEC };
140140
break;
141141
case 9: // Revenant
142-
if (aSpec == -1) entry = { ETextures::SpecRev, "TEX_SPEC_REV", "Revenant", IDB_SPEC_REV };
143-
else if (aSpec == 52) entry = { ETextures::SpecRevHer, "TEX_SPEC_REV_HER", "Herald", IDB_SPEC_REV_HER };
142+
if (aSpec == 52) entry = { ETextures::SpecRevHer, "TEX_SPEC_REV_HER", "Herald", IDB_SPEC_REV_HER };
144143
else if (aSpec == 63) entry = { ETextures::SpecRevRen, "TEX_SPEC_REV_REN", "Renegade", IDB_SPEC_REV_REN };
145144
else if (aSpec == 69) entry = { ETextures::SpecRevVin, "TEX_SPEC_REV_VIN", "Vindicator", IDB_SPEC_REV_VIN };
145+
else entry = { ETextures::SpecRev, "TEX_SPEC_REV", "Revenant", IDB_SPEC_REV };
146146
break;
147147
}
148148

0 commit comments

Comments
 (0)