1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00

fixed crash on adding/deleting colors to colortables

This commit is contained in:
Zeno Rogue 2024-05-10 18:37:05 +02:00
parent a130fbbc50
commit f2d81746a7

View File

@ -3487,7 +3487,7 @@ EX void edit_color_table(colortable& ct, const reaction_t& r IS(reaction_t()), b
if(!(ct[i] & 0x1000000)) return; if(!(ct[i] & 0x1000000)) return;
} }
dialog::openColorDialog(ct[i]); dialog::openColorDialog(ct[i]);
dialog::get_di().reaction = r; if(r) dialog::get_di().reaction = r;
dialog::colorAlpha = false; dialog::colorAlpha = false;
dialog::get_di().dialogflags |= sm::SIDE; dialog::get_di().dialogflags |= sm::SIDE;
}); });
@ -3496,14 +3496,14 @@ EX void edit_color_table(colortable& ct, const reaction_t& r IS(reaction_t()), b
dialog::addItem("add a color", 'A'); dialog::addItem("add a color", 'A');
dialog::add_action([&ct, r] { dialog::add_action([&ct, r] {
ct.push_back(rand() & 0x1FFFFFF); ct.push_back(rand() & 0x1FFFFFF);
r(); if(r) r();
}); });
if(isize(ct) > 2) { if(isize(ct) > 2) {
dialog::addItem("delete a color", 'D'); dialog::addItem("delete a color", 'D');
dialog::add_action([&ct, r] { dialog::add_action([&ct, r] {
ct.pop_back(); ct.pop_back();
r(); if(r) r();
}); });
} }