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

Merge pull request #3753 from myk002/myk_seedwatch 

[seedwatch] fix crash on bad seed ids in configs
develop
Myk 2023-09-09 11:11:39 -07:00 committed by GitHub
parent c37d3e66b2 ee61c76bc0
commit fa36194f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -57,6 +57,7 @@ Template for new versions:
## Fixes ## Fixes
- `buildingplan`: make the construction dimensions readout visible again - `buildingplan`: make the construction dimensions readout visible again
- `seedwatch`: fix a crash when reading data saved by very very old versions of the plugin
## Misc Improvements ## Misc Improvements
- `sort`: sort by need for training on squad assignment screen - `sort`: sort by need for training on squad assignment screen

6
plugins/seedwatch.cpp
Unescape Escape View File

@ -102,7 +102,11 @@ static void remove_seed_config(color_ostream &out, int id) {
static bool validate_seed_config(color_ostream& out, PersistentDataItem c) static bool validate_seed_config(color_ostream& out, PersistentDataItem c)
{ {
int seed_id = get_config_val(c, SEED_CONFIG_ID); int seed_id = get_config_val(c, SEED_CONFIG_ID);
auto plant = binsearch_in_vector(world->raws.plants.all, &df::plant_raw::index, seed_id); auto plant = df::plant_raw::find(seed_id);
if (!plant) {
WARN(config, out).print("discarded invalid seed id: %d\n", seed_id);
return false;
}
bool valid = (!plant->flags.is_set(df::enums::plant_raw_flags::TREE)); bool valid = (!plant->flags.is_set(df::enums::plant_raw_flags::TREE));
if (!valid) { if (!valid) {
DEBUG(config, out).print("invalid configuration for %s discarded\n", plant->id.c_str()); DEBUG(config, out).print("invalid configuration for %s discarded\n", plant->id.c_str());