fix: initialize forbid config in existing saves

xBlackTalonX · xBlackTalonX · commit 48b5c9a11325 · 2024-05-12T20:33:08.000-06:00
diff --git a/plugins/logistics.cpp b/plugins/logistics.cpp
@@ -134,8 +134,6 @@ static void validate_stockpile_configs(color_ostream& out,
             to_remove.push_back(stockpile_number);
             continue;
         }
-        if (c.get_int(STOCKPILE_CONFIG_FORBID) == -1)
-            c.set_int(STOCKPILE_CONFIG_FORBID, 0);
         cache.emplace(bld, c);
     }
     for (int stockpile_number : to_remove)
@@ -179,6 +177,8 @@ DFhackCExport command_result plugin_load_site_data(color_ostream &out) {
         auto& c = loaded_persist_data[idx];
         if (c.key() == CONFIG_KEY)
             continue;
+        if (c.get_int(STOCKPILE_CONFIG_FORBID) == -1) // remove this once saves from 50.08 are no longer compatible
+            c.set_int(STOCKPILE_CONFIG_FORBID, 0);
         watched_stockpiles.emplace(c.get_int(STOCKPILE_CONFIG_STOCKPILE_NUMBER), c);
     }
     migrate_old_keys(out);

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,6 @@ static void validate_stockpile_configs(color_ostream& out,`
`134`	`134`	`to_remove.push_back(stockpile_number);`
`135`	`135`	`continue;`
`136`	`136`	`}`
`137`		`- if (c.get_int(STOCKPILE_CONFIG_FORBID) == -1)`
`138`		`- c.set_int(STOCKPILE_CONFIG_FORBID, 0);`
`139`	`137`	`cache.emplace(bld, c);`
`140`	`138`	`}`
`141`	`139`	`for (int stockpile_number : to_remove)`
`@@ -179,6 +177,8 @@ DFhackCExport command_result plugin_load_site_data(color_ostream &out) {`
`179`	`177`	`auto& c = loaded_persist_data[idx];`
`180`	`178`	`if (c.key() == CONFIG_KEY)`
`181`	`179`	`continue;`
	`180`	`+ if (c.get_int(STOCKPILE_CONFIG_FORBID) == -1) // remove this once saves from 50.08 are no longer compatible`
	`181`	`+ c.set_int(STOCKPILE_CONFIG_FORBID, 0);`
`182`	`182`	`watched_stockpiles.emplace(c.get_int(STOCKPILE_CONFIG_STOCKPILE_NUMBER), c);`
`183`	`183`	`}`
`184`	`184`	`migrate_old_keys(out);`