atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix saving for multi encounter group maps

Browse source
This commit is contained in:
garak 2019-06-20 17:08:28 -04:00
parent 5a62df9f55
commit d7dae219b1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/editor.cpp
View file

@ -303,6 +303,10 @@ void Editor::saveEncounterTabData() {
//} //}
int fieldIndex = 0; int fieldIndex = 0;
for (QPair<QString, QVector<int>> monField : project->wildMonFields) { for (QPair<QString, QVector<int>> monField : project->wildMonFields) {
QString fieldName = monField.first;
if (!encounterHeader.wildMons.contains(fieldName)
|| encounterHeader.wildMons[fieldName].wildPokemon.empty()
|| !encounterHeader.wildMons[fieldName].active) continue;
// project->wildMonData // project->wildMonData
//qDebug() << monField.first << "mons"; //qDebug() << monField.first << "mons";
QTableWidget *monTable = static_cast<QTableWidget *>(tabWidget->widget(fieldIndex++)); QTableWidget *monTable = static_cast<QTableWidget *>(tabWidget->widget(fieldIndex++));
@ -318,8 +322,9 @@ void Editor::saveEncounterTabData() {
newWildMon.maxLevel = monTable->cellWidget(row, 3)->findChild<QSpinBox *>()->value();//static_cast<QSpinBox *>(monTable->cellWidget(row, 3))->value(); newWildMon.maxLevel = monTable->cellWidget(row, 3)->findChild<QSpinBox *>()->value();//static_cast<QSpinBox *>(monTable->cellWidget(row, 3))->value();
newWildMons.append(newWildMon);//(speciesCombo->currentText()); newWildMons.append(newWildMon);//(speciesCombo->currentText());
} }
encounterHeader.wildMons[monField.first].wildPokemon = newWildMons; // Brackets because need a reference to this object. A safety check is done at the top.
encounterHeader.wildMons[monField.first].encounterRate = monTable->findChild<QSlider *>()->value(); encounterHeader.wildMons[fieldName].wildPokemon = newWildMons;
encounterHeader.wildMons[fieldName].encounterRate = monTable->findChild<QSlider *>()->value();
//fieldIndex++; //fieldIndex++;
} }
} }