openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix crash when viewing PC spell list

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-14 15:31:51 -04:00
parent 8ecf76e758
commit 146eb5dd40
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osx/boe.infodlg.cpp
View File

@@ -208,11 +208,11 @@ void put_pc_spells(cDialog& me)
{ {
short i; short i;
for (i = 3; i < 65; i++) { for (i = 0; i < 62; i++) {
std::string id = "spell" + boost::lexical_cast<std::string>(i + 1); std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
cLed& cur = dynamic_cast<cLed&>(me[id]); cLed& cur = dynamic_cast<cLed&>(me[id]);
if (((store_trait_mode == 0) && (univ.party[which_pc_displayed].mage_spells[i - 3] == true)) || if (((store_trait_mode == 0) && univ.party[which_pc_displayed].mage_spells[i]) ||
((store_trait_mode == 1) && (univ.party[which_pc_displayed].priest_spells[i - 3] == true))) ((store_trait_mode == 1) && univ.party[which_pc_displayed].priest_spells[i]))
cur.setState(led_red); cur.setState(led_red);
else cur.setState(led_off); else cur.setState(led_off);
} }
@@ -242,7 +242,7 @@ bool display_pc_event_filter(cDialog& me, std::string item_hit, eKeyMod mods)
} }
} }
void display_pc(short pc_num,short mode,short parent) void display_pc(short pc_num,short mode,cDialog* parent)
{ {
short i,item_hit; short i,item_hit;
std::string label_str; std::string label_str;
@@ -257,12 +257,12 @@ void display_pc(short pc_num,short mode,short parent)
make_cursor_sword(); make_cursor_sword();
cDialog pcInfo("pc-spell-info.xml"); cDialog pcInfo("pc-spell-info.xml", parent);
pcInfo.attachClickHandlers(display_pc_event_filter,{"done","left","right"}); pcInfo.attachClickHandlers(display_pc_event_filter,{"done","left","right"});
for (i = 3; i < 65; i++) { for (i = 0; i < 62; i++) {
std::string id = "spell" + boost::lexical_cast<std::string>(i + 1); std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
label_str = get_str((mode == 0) ? "mage-spells" : "priest-spells",(i - 3) * 2 + 1); label_str = get_str((mode == 0) ? "mage-spells" : "priest-spells",i * 2 + 1);
pcInfo[id].setText(label_str); pcInfo[id].setText(label_str);
} }
put_pc_spells(pcInfo); put_pc_spells(pcInfo);

2
osx/boe.infodlg.h
View File

@@ -4,7 +4,7 @@
class cDialog; class cDialog;
void display_spells(short mode,short force_spell,cDialog* parent); void display_spells(short mode,short force_spell,cDialog* parent);
void display_skills(short force_skill,cDialog* parent); void display_skills(short force_skill,cDialog* parent);
void display_pc(short pc_num,short mode,short parent_num); void display_pc(short pc_num,short mode,cDialog* parent_num);
void display_pc_item(short pc_num,short item,cItemRec si,short parent); void display_pc_item(short pc_num,short item,cItemRec si,short parent);
void display_monst(short array_pos,cCreature *which_m,short mode); void display_monst(short array_pos,cCreature *which_m,short mode);
void display_alchemy(cDialog* parent); void display_alchemy(cDialog* parent);