redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-05-04 00:47:46 +00:00
Code Activity

Fix crash in map editor when encountering empty rows

Browse source
This commit is contained in:
Joshua Goins 2025-05-01 17:59:31 -04:00
parent b8693effc0
commit d82333ae3e
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/mapeditor/src/maplistwidget.cpp
View file

@ -51,30 +51,31 @@ MapListWidget::MapListWidget(GameData *data, QWidget *parent)
const uint16_t territoryTypeKey = rows.row_data[0].column_data[15].u_int16._0; const uint16_t territoryTypeKey = rows.row_data[0].column_data[15].u_int16._0;
if (territoryTypeKey > 0 && territoryTypeKey < territoryExh->row_count) { if (territoryTypeKey > 0 && territoryTypeKey < territoryExh->row_count) {
auto territoryExdRow = physis_exd_read_row(&territoryExd, territoryTypeKey); // TODO: free, use all rows auto territoryExdRow = physis_exd_read_row(&territoryExd, territoryTypeKey); // TODO: free, use all rows
if (territoryExdRow.row_count != 0) {
const char *bg = territoryExdRow.row_data[0].column_data[1].string._0;
const char *bg = territoryExdRow.row_data[0].column_data[1].string._0; int placeRegionKey = territoryExdRow.row_data[0].column_data[3].u_int16._0;
auto regionExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows
const char *placeRegion = regionExdRow.row_data[0].column_data[0].string._0;
int placeRegionKey = territoryExdRow.row_data[0].column_data[3].u_int16._0; int placeZoneKey = territoryExdRow.row_data[0].column_data[4].u_int16._0;
auto regionExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows auto zoneExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows
const char *placeRegion = regionExdRow.row_data[0].column_data[0].string._0; const char *placeZone = zoneExdRow.row_data[0].column_data[0].string._0;
int placeZoneKey = territoryExdRow.row_data[0].column_data[4].u_int16._0; int placeNameKey = territoryExdRow.row_data[0].column_data[5].u_int16._0;
auto zoneExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows auto nameExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows
const char *placeZone = zoneExdRow.row_data[0].column_data[0].string._0; const char *placeName = nameExdRow.row_data[0].column_data[0].string._0;
int placeNameKey = territoryExdRow.row_data[0].column_data[5].u_int16._0; QStandardItem *item = new QStandardItem();
auto nameExdRow = physis_exd_read_row(&nameExd, placeRegionKey); // TODO: free, use all rows item->setData(QString::fromStdString(bg));
const char *placeName = nameExdRow.row_data[0].column_data[0].string._0; item->setText(QStringLiteral("%1 (%2, %3, %4)")
.arg(QString::fromStdString(id),
QString::fromStdString(placeRegion),
QString::fromStdString(placeZone),
QString::fromStdString(placeName)));
QStandardItem *item = new QStandardItem(); originalModel->insertRow(originalModel->rowCount(), item);
item->setData(QString::fromStdString(bg)); }
item->setText(QStringLiteral("%1 (%2, %3, %4)")
.arg(QString::fromStdString(id),
QString::fromStdString(placeRegion),
QString::fromStdString(placeZone),
QString::fromStdString(placeName)));
originalModel->insertRow(originalModel->rowCount(), item);
} }
} }