Fix Stealth and Firewalk icons being swapped
This commit is contained in:
@@ -641,7 +641,7 @@ void put_text_bar(std::string str) {
|
|||||||
to_rect.width() = 12;
|
to_rect.width() = 12;
|
||||||
to_rect.height() = 12;
|
to_rect.height() = 12;
|
||||||
if(univ.party.status[ePartyStatus::STEALTH] > 0) {
|
if(univ.party.status[ePartyStatus::STEALTH] > 0) {
|
||||||
rect_draw_some_item(status_gworld, get_stat_effect_rect(25), text_bar_gworld, to_rect, sf::BlendAlpha);
|
rect_draw_some_item(status_gworld, get_stat_effect_rect(26), text_bar_gworld, to_rect, sf::BlendAlpha);
|
||||||
to_rect.offset(-15, 0);
|
to_rect.offset(-15, 0);
|
||||||
}
|
}
|
||||||
if(univ.party.status[ePartyStatus::FLIGHT] > 0) {
|
if(univ.party.status[ePartyStatus::FLIGHT] > 0) {
|
||||||
@@ -653,7 +653,7 @@ void put_text_bar(std::string str) {
|
|||||||
to_rect.offset(-15, 0);
|
to_rect.offset(-15, 0);
|
||||||
}
|
}
|
||||||
if(univ.party.status[ePartyStatus::FIREWALK] > 0) {
|
if(univ.party.status[ePartyStatus::FIREWALK] > 0) {
|
||||||
rect_draw_some_item(status_gworld, get_stat_effect_rect(26), text_bar_gworld, to_rect, sf::BlendAlpha);
|
rect_draw_some_item(status_gworld, get_stat_effect_rect(25), text_bar_gworld, to_rect, sf::BlendAlpha);
|
||||||
to_rect.offset(-15, 0);
|
to_rect.offset(-15, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -777,7 +777,7 @@ pic_num_t choose_status_effect(short cur, bool party, cDialog* parent) {
|
|||||||
};
|
};
|
||||||
static const char*const pstatus[] = {"Stealth", "Flight", "Detect Life", "Firewalk"};
|
static const char*const pstatus[] = {"Stealth", "Flight", "Detect Life", "Firewalk"};
|
||||||
static const std::vector<pic_num_t> status_pics = {4,2,0,6,5,9,10,11,12,13,14,15,16,17,20};
|
static const std::vector<pic_num_t> status_pics = {4,2,0,6,5,9,10,11,12,13,14,15,16,17,20};
|
||||||
static const std::vector<pic_num_t> pstatus_pics = {25,23,24,26};
|
static const std::vector<pic_num_t> pstatus_pics = {26,23,24,25};
|
||||||
short prev = cur;
|
short prev = cur;
|
||||||
if(cur < 0 || cur >= (party ? pstatus_pics : status_pics).size()) cur = 0;
|
if(cur < 0 || cur >= (party ? pstatus_pics : status_pics).size()) cur = 0;
|
||||||
cPictChoice pic_dlg(party ? pstatus_pics : status_pics, PIC_STATUS, parent);
|
cPictChoice pic_dlg(party ? pstatus_pics : status_pics, PIC_STATUS, parent);
|
||||||
|
|||||||
Reference in New Issue
Block a user