MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2802 from myk002/myk_automelt 

[automelt] improve resistance to morphed building ids
develop
Myk 2023-02-04 22:50:34 -08:00 committed by GitHub
parent 11e3362670 2daf1ceca5
commit 427b90c9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Fixes ## Fixes
## Misc Improvements ## Misc Improvements
- `automelt`: is now more resistent to savegame corruption
## Documentation ## Documentation

15
plugins/automelt.cpp
Unescape Escape View File

@ -115,15 +115,19 @@ static void remove_stockpile_config(color_ostream &out, int id)
watched_stockpiles.erase(id); watched_stockpiles.erase(id);
} }
static bool isStockpile(df::building * building) {
return building->getType() == df::building_type::Stockpile;
}
static void validate_stockpile_configs(color_ostream &out) static void validate_stockpile_configs(color_ostream &out)
{ {
for (auto &c : watched_stockpiles) { for (auto &c : watched_stockpiles) {
int id = get_config_val(c.second, STOCKPILE_CONFIG_ID); int id = get_config_val(c.second, STOCKPILE_CONFIG_ID);
if (!df::building::find(id)){ auto bld = df::building::find(id);
if (!bld || !isStockpile(bld))
remove_stockpile_config(out, id); remove_stockpile_config(out, id);
} }
} }
}
static const int32_t CYCLE_TICKS = 1200; static const int32_t CYCLE_TICKS = 1200;
static int32_t cycle_timestamp = 0; // world->frame_counter at last cycle static int32_t cycle_timestamp = 0; // world->frame_counter at last cycle
@ -268,10 +272,6 @@ static inline bool is_metal_item(df::item *item)
return (mat.getCraftClass() == craft_material_class::Metal); return (mat.getCraftClass() == craft_material_class::Metal);
} }
static bool isStockpile(df::building * building) {
return building->getType() == df::building_type::Stockpile;
}
struct BadFlagsCanMelt { struct BadFlagsCanMelt {
uint32_t whole; uint32_t whole;
@ -305,7 +305,6 @@ struct BadFlagsMarkItem {
// Copied from Kelly Martin's code // Copied from Kelly Martin's code
static inline bool can_melt(df::item *item) static inline bool can_melt(df::item *item)
{ {
static const BadFlagsCanMelt bad_flags; static const BadFlagsCanMelt bad_flags;
if (item->flags.whole & bad_flags.whole) if (item->flags.whole & bad_flags.whole)
@ -356,7 +355,7 @@ static inline bool is_set_to_melt(df::item *item)
static int mark_item(color_ostream &out, df::item *item, BadFlagsMarkItem bad_flags, int32_t stockpile_id, static int mark_item(color_ostream &out, df::item *item, BadFlagsMarkItem bad_flags, int32_t stockpile_id,
int32_t &premarked_item_count, int32_t &item_count, map<int32_t, bool> &tracked_item_map, bool should_melt) int32_t &premarked_item_count, int32_t &item_count, map<int32_t, bool> &tracked_item_map, bool should_melt)
{ {
DEBUG(perf,out).print("%s running mark_item\nshould_melt=%d\n", plugin_name,should_melt); DEBUG(perf,out).print("%s running mark_item: should_melt=%d\n", plugin_name, should_melt);
if (DBG_NAME(perf).isEnabled(DebugCategory::LDEBUG)) { if (DBG_NAME(perf).isEnabled(DebugCategory::LDEBUG)) {
string name = ""; string name = "";