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

Fix crash when deleting a monster ability

Browse Source
This commit is contained in:
Celtic Minstrel
2015-08-14 23:40:43 -04:00
parent 5762c2bb90
commit b5300b9bfb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/scenedit/scen.core.cpp
View File

@@ -1200,9 +1200,9 @@ static bool edit_monst_abil_detail(cDialog& me, std::string hit, cMonster& monst
cDialog abil_dlg("edit-mabil-" + which_dlg, &me);
abil_dlg["okay"].attachClickHandler(std::bind(&cDialog::toast, _1, true));
abil_dlg["cancel"].attachClickHandler(std::bind(&cDialog::toast, _1, false));
abil_dlg["delete"].attachClickHandler([&monst,iter](cDialog& me,std::string,eKeyMod){
abil_dlg["delete"].attachClickHandler([&monst,&iter](cDialog& me,std::string,eKeyMod){
// TODO: Show confirmation first?
return me.toast(false), monst.abil.erase(iter), true;
return me.toast(false), iter = monst.abil.erase(iter), true;
});
auto onfocus = [&](cDialog& me,std::string,bool losing) -> bool {
if(!losing) return true;
@@ -1329,8 +1329,11 @@ static bool edit_monst_abil_detail(cDialog& me, std::string hit, cMonster& monst
if(abil_dlg.accepted())
iter->second = abil_params;
put_monst_abils_in_dlog(me, monst);
size_t iShow = std::distance(monst.abil.begin(), iter);
dynamic_cast<cStack&>(me["abils"]).setPage(iShow / 4);
if(monst.abil.size() > 0) {
cStack& stk = dynamic_cast<cStack&>(me["abils"]);
size_t iShow = iter == monst.abil.end() ? stk.getPageCount() - 1 : std::distance(monst.abil.begin(), iter) / 4;
stk.setPage(iShow);
}
return true;
}