From 653e09c322c895f0e3dc7c6d324ac2d5e046ad88 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 18 Jan 2023 00:08:21 -0800 Subject: [PATCH] make gcc happy --- plugins/buildingplan.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp index 09313c21a..1407e5c46 100644 --- a/plugins/buildingplan.cpp +++ b/plugins/buildingplan.cpp @@ -83,7 +83,7 @@ public: } PlannedBuilding(DFHack::PersistentDataItem &bld_config) - : bld_config(bld_config), id(get_config_val(bld_config, BLD_CONFIG_ID)) { } + : id(get_config_val(bld_config, BLD_CONFIG_ID)), bld_config(bld_config) { } void remove(color_ostream &out); @@ -179,8 +179,10 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) { vector building_configs; World::GetPersistentData(&building_configs, BLD_CONFIG_KEY); const size_t num_building_configs = building_configs.size(); - for (size_t idx = 0; idx < num_building_configs; ++idx) - registerPlannedBuilding(out, PlannedBuilding(building_configs[idx])); + for (size_t idx = 0; idx < num_building_configs; ++idx) { + PlannedBuilding pb(building_configs[idx]); + registerPlannedBuilding(out, pb); + } return CR_OK; } @@ -616,7 +618,7 @@ static void printStatus(color_ostream &out) { } static bool setSetting(color_ostream &out, string name, bool value) { - DEBUG(status,out).print("entering setSetting (%s -> %s)\n", name, value ? "true" : "false"); + DEBUG(status,out).print("entering setSetting (%s -> %s)\n", name.c_str(), value ? "true" : "false"); if (name == "blocks") set_config_bool(config, CONFIG_BLOCKS, value); else if (name == "boulders") @@ -660,7 +662,8 @@ static bool addPlannedBuilding(color_ostream &out, df::building *bld) { || !isPlannableBuilding(out, bld->getType(), bld->getSubtype(), bld->getCustomType())) return false; - return registerPlannedBuilding(out, PlannedBuilding(out, bld)); + PlannedBuilding pb(out, bld); + return registerPlannedBuilding(out, pb); } static void doCycle(color_ostream &out) {