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

Use the editable string picker for item type flags in the item editor.

Browse Source
This commit is contained in:
Celtic Minstrel
2025-02-23 11:59:16 -05:00
committed by Celtic Minstrel
parent 0ccdd38cb1
commit 1ad973c59e
8 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio/fileio_scen.cpp
View File

@@ -959,6 +959,12 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
if(icnum > scenario.ic_names.size())
scenario.ic_names.resize(icnum);
edit->GetText(&scenario.ic_names[icnum - 1], false);
} else if(type == "item-typeflag") {
int itfnum = 0;
edit->GetAttribute("id", &itfnum);
if(itfnum > scenario.itf_names.size())
scenario.itf_names.resize(itfnum);
edit->GetText(&scenario.itf_names[itfnum - 1], false);
} else if(type == "graphics") {
static const std::set<ePicType> valid_pictypes = {
PIC_TER, PIC_TER_ANIM, PIC_TER_MAP,

1
src/scenario/scenario.cpp
View File

@@ -204,6 +204,7 @@ void swap(cScenario& lhs, cScenario& rhs) {
swap(lhs.towns, rhs.towns);
swap(lhs.evt_names, rhs.evt_names);
swap(lhs.ic_names, rhs.ic_names);
swap(lhs.itf_names, rhs.itf_names);
}
cScenario::cItemStorage::cItemStorage() : ter_type(-1), property(0) {

1
src/scenario/scenario.hpp
View File

@@ -102,6 +102,7 @@ public:
std::vector<std::string> snd_names;
std::vector<std::string> evt_names;
std::vector<std::string> ic_names;
std::vector<std::string> itf_names;
bool adjust_diff;
bool is_legacy;
fs::path scen_file; // transient

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

@@ -1727,6 +1727,10 @@ static bool edit_item_type_event_filter(cDialog& me, std::string hit, cItem& ite
int value = me["class"].getTextAsNum();
value = choose_text_editable(scenario.ic_names, value, &me, "Select item class:");
me["class"].setTextToNum(value);
} else if(hit == "edit-flag") {
int value = me["flag"].getTextAsNum();
value = choose_text_editable(scenario.itf_names, value, &me, "Select item type flag:");
me["flag"].setTextToNum(value);
}
return true;
}
@@ -1780,7 +1784,7 @@ bool edit_item_type(short which) {
item_dlg["weight"].attachFocusHandler(std::bind(check_range, _1, _2, _3, 0, 250, "Weight"));
item_dlg["class"].attachFocusHandler(std::bind(check_range, _1, _2, _3, 0, 100, "Special Class"));
item_dlg["variety"].attachFocusHandler(std::bind(change_item_variety, _1, _2, std::ref(item)));
item_dlg.attachClickHandlers(std::bind(edit_item_type_event_filter, _1, _2, std::ref(item), std::ref(which)), {"okay", "cancel", "abils", "choosepic", "choosetp", "choosemiss", "desc", "preview", "edit-ic"});
item_dlg.attachClickHandlers(std::bind(edit_item_type_event_filter, _1, _2, std::ref(item), std::ref(which)), {"okay", "cancel", "abils", "choosepic", "choosetp", "choosemiss", "desc", "preview", "edit-ic", "edit-flag"});
if(scenario.scen_items.size() == 1) {
item_dlg["prev"].hide();

7
src/scenedit/scen.fileio.cpp
View File

@@ -408,6 +408,13 @@ void writeScenarioToXml(ticpp::Printer&& data, cScenario& scenario) {
data.PushText(scenario.ic_names[i]);
data.CloseElement("item-class");
}
for(int i = 0; i < scenario.itf_names.size(); i++) {
if(scenario.itf_names[i].empty()) continue;
data.OpenElement("item-typeflag");
data.PushAttribute("id", i + 1);
data.PushText(scenario.itf_names[i]);
data.CloseElement("item-typeflag");
}
data.CloseElement("editor");
data.CloseElement("scenario");
}