From 5cfd4c9fff3e5851dbb6fdb6bb7c887842f51713 Mon Sep 17 00:00:00 2001 From: godric3 Date: Mon, 6 Jan 2025 19:44:25 +0100 Subject: [PATCH] map editor: remove no longer needed check - getTown() return also randomTown --- mapeditor/inspector/townbuildingswidget.cpp | 7 ------- mapeditor/inspector/towneventdialog.cpp | 4 ---- mapeditor/playerparams.cpp | 2 -- 3 files changed, 13 deletions(-) diff --git a/mapeditor/inspector/townbuildingswidget.cpp b/mapeditor/inspector/townbuildingswidget.cpp index 708928741..9132892a5 100644 --- a/mapeditor/inspector/townbuildingswidget.cpp +++ b/mapeditor/inspector/townbuildingswidget.cpp @@ -332,11 +332,6 @@ void TownBuildingsDelegate::setEditorData(QWidget *editor, const QModelIndex &in if(auto * ed = qobject_cast(editor)) { auto * ctown = town.getTown(); - if(!ctown) - ctown = VLC->townh->randomTown; - if(!ctown) - throw std::runtime_error("No Town defined for type selected"); - ed->addBuildings(*ctown); } else @@ -366,8 +361,6 @@ void TownBuildingsDelegate::updateModelData(QAbstractItemModel * model, const QM QStringList textList; textList += QObject::tr("Built buildings:"); auto * ctown = town.getTown(); - if(!ctown) - ctown = VLC->townh->randomTown; for(const auto & buildingID : town.getBuildings()) { if(buildingID == BuildingID::DEFAULT) diff --git a/mapeditor/inspector/towneventdialog.cpp b/mapeditor/inspector/towneventdialog.cpp index 6ab833be3..7d5ff496d 100644 --- a/mapeditor/inspector/towneventdialog.cpp +++ b/mapeditor/inspector/towneventdialog.cpp @@ -105,10 +105,6 @@ void TownEventDialog::initResources() void TownEventDialog::initBuildings() { auto * ctown = town.getTown(); - if (!ctown) - ctown = VLC->townh->randomTown; - if (!ctown) - throw std::runtime_error("No Town defined for type selected"); auto allBuildings = ctown->getAllBuildings(); while (!allBuildings.empty()) { diff --git a/mapeditor/playerparams.cpp b/mapeditor/playerparams.cpp index 95ebbcbac..3e2caf2bc 100644 --- a/mapeditor/playerparams.cpp +++ b/mapeditor/playerparams.cpp @@ -80,8 +80,6 @@ PlayerParams::PlayerParams(MapController & ctrl, int playerId, QWidget *parent) if(auto town = dynamic_cast(controller.map()->objects[i].get())) { auto * ctown = town->getTown(); - if(!ctown) - ctown = VLC->townh->randomTown; if(ctown && town->getOwner().getNum() == playerColor) {