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

Replaced poor auto with actual type

develop
PatrikLundell 2020-01-16 12:57:09 +01:00
parent cd4b00e23e
commit ee2259bbca
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/getplants.cpp
Unescape Escape View File

@ -84,7 +84,7 @@ selectability selectablePlant(const df::plant_raw *plant)
return selectability::Selectable; return selectability::Selectable;
} }
for (auto i = 0; i < plant->growths.size(); i++) for (size_t i = 0; i < plant->growths.size(); i++)
{ {
if (plant->growths[i]->item_type == df::item_type::SEEDS || // Only trees have seed growths in vanilla, but raws can be modded... if (plant->growths[i]->item_type == df::item_type::SEEDS || // Only trees have seed growths in vanilla, but raws can be modded...
plant->growths[i]->item_type == df::item_type::PLANT_GROWTH) plant->growths[i]->item_type == df::item_type::PLANT_GROWTH)
@ -146,7 +146,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
{ {
string plantMatStr = ""; string plantMatStr = "";
std::vector<selectability> plantSelections; std::vector<selectability> plantSelections;
std::vector<uint16_t> collectionCount; std::vector<size_t> collectionCount;
set<string> plantNames; set<string> plantNames;
bool deselect = false, exclude = false, treesonly = false, shrubsonly = false, all = false, verbose = false; bool deselect = false, exclude = false, treesonly = false, shrubsonly = false, all = false, verbose = false;
@ -155,7 +155,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
plantSelections.resize(world->raws.plants.all.size()); plantSelections.resize(world->raws.plants.all.size());
collectionCount.resize(world->raws.plants.all.size()); collectionCount.resize(world->raws.plants.all.size());
for (auto i = 0; i < plantSelections.size(); i++) for (size_t i = 0; i < plantSelections.size(); i++)
{ {
plantSelections[i] = selectability::Unselected; plantSelections[i] = selectability::Unselected;
collectionCount[i] = 0; collectionCount[i] = 0;
@ -248,7 +248,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
return CR_FAILURE; return CR_FAILURE;
} }
for (auto i = 0; i < plantSelections.size(); i++) for (size_t i = 0; i < plantSelections.size(); i++)
{ {
if (plantSelections[i] == selectability::OutOfSeason || if (plantSelections[i] == selectability::OutOfSeason ||
plantSelections[i] == selectability::Selectable) plantSelections[i] == selectability::Selectable)
@ -327,7 +327,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
} }
if (!deselect && Designations::markPlant(plant)) if (!deselect && Designations::markPlant(plant))
{ {
// out.print("Designated %s at (%i, %i, %i), %i\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, i); // out.print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, i);
collectionCount[plant->material]++; collectionCount[plant->material]++;
++count; ++count;
} }
@ -336,10 +336,10 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
{ {
if (verbose) if (verbose)
{ {
for (auto i = 0; i < plantSelections.size(); i++) for (size_t i = 0; i < plantSelections.size(); i++)
{ {
if (collectionCount[i] > 0) if (collectionCount[i] > 0)
out.print("Updated %i %s designations.\n", collectionCount[i], world->raws.plants.all[i]->id.c_str()); out.print("Updated %d %s designations.\n", collectionCount[i], world->raws.plants.all[i]->id.c_str());
} }
out.print("\n"); out.print("\n");
} }
@ -357,11 +357,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
" Specify the types of trees to cut down and/or shrubs to gather by their\n" " Specify the types of trees to cut down and/or shrubs to gather by their\n"
" plant IDs, separated by spaces.\n" " plant IDs, separated by spaces.\n"
"Options:\n" "Options:\n"
" -t - Select trees only (exclude shrubs)\n" " -t - Tree: Select trees only (exclude shrubs)\n"
" -s - Select shrubs only (exclude trees)\n" " -s - Shrub: Select shrubs only (exclude trees)\n"
" -c - Clear designations instead of setting them\n" " -c - Clear: Clear designations instead of setting them\n"
" -x - Apply selected action to all plants except those specified\n" " -x - eXept: Apply selected action to all plants except those specified\n"
" -a - Select every type of plant (obeys -t/-s)\n" " -a - All: Select every type of plant (obeys -t/-s)\n"
" -v - Verbose: lists the number of (un)designations per plant\n" " -v - Verbose: lists the number of (un)designations per plant\n"
"Specifying both -t and -s will have no effect.\n" "Specifying both -t and -s will have no effect.\n"
"If no plant IDs are specified, all valid plant IDs will be listed.\n" "If no plant IDs are specified, all valid plant IDs will be listed.\n"