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

Replace 4-character constants with enums

Browse Source 
This covers only the places where they were used to indicate
a preset selection in constructors.

The usage in qdpict where they're actually passed to the Resource Manager,
as well as the 4-character constants representing file types and creator
codes, are still present.
This commit is contained in:
Celtic Minstrel
2020-02-21 00:15:56 -05:00
parent 3d7f8f1d2a
commit 7b93726383
14 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2419,7 +2419,7 @@ static bool add_shop_entry(cDialog& me, std::string type, cShop& shop, size_t wh
shop.addItem(which_item, scenario.scen_items[which_item], amount);
else shop.addItem(which_item, scenario.scen_items[which_item], amount % 1000, amount / 1000);
} else if(type == "spec") {
cItem item('spec');
cItem item(ITEM_SPECIAL);
size_t amount = 0;
edit_shop_special(me, item, amount);
shop.addSpecial(item.full_name, item.desc, item.graphic_num, item.item_level, item.value, amount);
@@ -2486,7 +2486,7 @@ bool edit_shop(size_t which_shop, cDialog* parent) {
shop_dlg.attachClickHandlers(std::bind(edit_shop_entry, _1, _2, std::ref(shop)), {"ed1", "ed2", "ed3", "ed4", "ed5"});
shop_dlg.attachClickHandlers(std::bind(add_shop_entry, _1, _2, std::ref(shop), std::ref(which_shop)), {"item", "opt", "spec", "mage", "priest", "alch", "skill", "treas", "heal", "class"});
shop_dlg["rand"].attachClickHandler([&shop,which_shop](cDialog& me, std::string, eKeyMod) -> bool {
shop = cShop('junk');
shop = cShop(SHOP_JUNK);
put_shop_in_dlog(me, shop, which_shop);
return true;
});
@@ -2988,7 +2988,7 @@ bool build_scenario() {
warriors_grove->reattach(scenario);
}
scenario.shops.push_back(cShop('heal'));
scenario.shops.push_back(cShop(SHOP_HEALING));
overall_mode = MODE_MAIN_SCREEN;