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

forgot to update profile save/load

develop
PatrikLundell 2020-03-15 17:56:13 +01:00
parent 7e2872e607
commit 5c913270d6
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/embark-assistant/finder_ui.cpp
Unescape Escape View File

@ -168,20 +168,26 @@ namespace embark_assist {
FILE* outfile = fopen(profile_file_name, "w"); FILE* outfile = fopen(profile_file_name, "w");
fields i = first_fields; fields i = first_fields;
size_t civ = 0;
while (true) { while (true) {
for (size_t k = 0; k < state->ui[static_cast<int8_t>(i)]->list.size(); k++) { for (size_t k = 0; k < state->ui[static_cast<int8_t>(i)]->list.size(); k++) {
if (state->ui[static_cast<int8_t>(i)]->current_value == state->ui[static_cast<int8_t>(i)]->list[k].key) { if (state->ui[static_cast<int8_t>(i) + civ]->current_value == state->ui[static_cast<int8_t>(i) + civ]->list[k].key) {
fprintf(outfile, "[%s:%s]\n", state->finder_list[static_cast<int8_t>(i)].text.c_str(), state->ui[static_cast<int8_t>(i)]->list[k].text.c_str()); fprintf(outfile, "[%s:%s]\n", state->finder_list[static_cast<int8_t>(i) + civ].text.c_str(), state->ui[static_cast<int8_t>(i) + civ]->list[k].text.c_str());
break; break;
} }
} }
// fprintf(outfile, "[%s:%i]\n", state->finder_list[static_cast<int8_t>(i)].text.c_str(), state->ui[static_cast<int8_t>(i)]->current_value); // fprintf(outfile, "[%s:%i]\n", state->finder_list[static_cast<int8_t>(i)].text.c_str(), state->ui[static_cast<int8_t>(i)]->current_value);
if (i == last_fields) { if (i == last_fields) {
break; // done civ++;
}
i = static_cast <fields>(static_cast<int8_t>(i) + 1); if (civ == state->civs.size()) {
break; // done
}
}
else {
i = static_cast <fields>(static_cast<int8_t>(i) + 1);
}
} }
fclose(outfile); fclose(outfile);
@ -192,6 +198,7 @@ namespace embark_assist {
void load_profile() { void load_profile() {
color_ostream_proxy out(Core::getInstance().getConsole()); color_ostream_proxy out(Core::getInstance().getConsole());
FILE* infile = fopen(profile_file_name, "r"); FILE* infile = fopen(profile_file_name, "r");
size_t civ = 0;
if (!infile) { if (!infile) {
out.printerr("No profile file found at %s\n", profile_file_name); out.printerr("No profile file found at %s\n", profile_file_name);
@ -213,8 +220,8 @@ namespace embark_assist {
for (int k = 1; k < count; k++) { for (int k = 1; k < count; k++) {
if (line[k] == ':') { if (line[k] == ':') {
for (int l = 1; l < k; l++) { for (int l = 1; l < k; l++) {
if (state->finder_list[static_cast<int8_t>(i)].text.c_str()[l - 1] != line[l]) { if (state->finder_list[static_cast<int8_t>(i) + civ].text.c_str()[l - 1] != line[l]) {
out.printerr("Token mismatch of %s vs %s\n", line, state->finder_list[static_cast<int8_t>(i)].text.c_str()); out.printerr("Token mismatch of %s vs %s\n", line, state->finder_list[static_cast<int8_t>(i) + civ].text.c_str());
fclose(infile); fclose(infile);
return; return;
} }
@ -222,10 +229,10 @@ namespace embark_assist {
found = false; found = false;
for (size_t l = 0; l < state->ui[static_cast<int8_t>(i)]->list.size(); l++) { for (size_t l = 0; l < state->ui[static_cast<int8_t>(i) + civ]->list.size(); l++) {
for (int m = k + 1; m < count; m++) { for (int m = k + 1; m < count; m++) {
if (state->ui[static_cast<int8_t>(i)]->list[l].text.c_str()[m - (k + 1)] != line[m]) { if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
if (state->ui[static_cast<int8_t>(i)]->list[l].text.c_str()[m - (k + 1)] == '\0' && if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
line[m] == ']') { line[m] == ']') {
found = true; found = true;
} }
@ -254,10 +261,15 @@ namespace embark_assist {
} }
if (i == last_fields) { if (i == last_fields) {
break; // done civ++;
}
i = static_cast <fields>(static_cast<int8_t>(i) + 1); if (civ == state->civs.size()) {
break; // done
}
}
else {
i = static_cast <fields>(static_cast<int8_t>(i) + 1);
}
} }
fclose(infile); fclose(infile);
@ -266,6 +278,7 @@ namespace embark_assist {
infile = fopen(profile_file_name, "r"); infile = fopen(profile_file_name, "r");
i = first_fields; i = first_fields;
civ = 0;
while (true) { while (true) {
if (!fgets(line, count, infile)) if (!fgets(line, count, infile))
@ -278,13 +291,13 @@ namespace embark_assist {
found = false; found = false;
for (size_t l = 0; l < state->ui[static_cast<int8_t>(i)]->list.size(); l++) { for (size_t l = 0; l < state->ui[static_cast<int8_t>(i) + civ]->list.size(); l++) {
for (int m = k + 1; m < count; m++) { for (int m = k + 1; m < count; m++) {
if (state->ui[static_cast<int8_t>(i)]->list[l].text.c_str()[m - (k + 1)] != line[m]) { if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] != line[m]) {
if (state->ui[static_cast<int8_t>(i)]->list[l].text.c_str()[m - (k + 1)] == '\0' && if (state->ui[static_cast<int8_t>(i) + civ]->list[l].text.c_str()[m - (k + 1)] == '\0' &&
line[m] == ']') { line[m] == ']') {
state->ui[static_cast<int8_t>(i)]->current_value = state->ui[static_cast<int8_t>(i)]->list[l].key; state->ui[static_cast<int8_t>(i) + civ]->current_value = state->ui[static_cast<int8_t>(i) + civ]->list[l].key;
state->ui[static_cast<int8_t>(i)]->current_display_value = l; state->ui[static_cast<int8_t>(i) + civ]->current_display_value = l;
found = true; found = true;
} }
@ -301,10 +314,15 @@ namespace embark_assist {
} }
if (i == last_fields) { if (i == last_fields) {
break; // done civ++;
}
i = static_cast <fields>(static_cast<int8_t>(i) + 1); if (civ == state->civs.size()) {
break; // done
}
}
else {
i = static_cast <fields>(static_cast<int8_t>(i) + 1);
}
} }
fclose(infile); fclose(infile);