Changed EntityConverter constructor - now pre-scans vector

This commit is contained in:
2017-07-06 17:53:43 -07:00
parent 821d6001bf
commit fd5b203b06

View File

@ -96,14 +96,15 @@ void print_entities(vector<vector<string> > &q) {
} }
void convert_entities(const cxxopts::Options &o, vector<vector<string> > &q) { void convert_entities(const cxxopts::Options &o, const vector<vector<string> > &q) {
string entfile = o["e"].as<string>(); string entfile = o["e"].as<string>();
if (entfile.empty()) { if (entfile.empty()) {
cout << "No entity data file given" cout << "No entity data file given"
"- skipping entity conversion" << endl; "- skipping entity conversion" << endl;
return; return;
} }
EntityConverter e(entfile, o[ARG_INPUT_SHORTALIAS].as<string>()); EntityConverter e(entfile);
e.extractMapInfo(q);
ofstream fout(o[ARG_OUTPUT_SHORTALIAS].as<string>(), ios::app); ofstream fout(o[ARG_OUTPUT_SHORTALIAS].as<string>(), ios::app);
brushdef fn = &brushdef_net; brushdef fn = &brushdef_net;
vector<string> entity; vector<string> entity;