Sfoglia il codice sorgente

map editor: remove no longer needed check - getTown() return also randomTown

godric3 9 mesi fa
parent
commit
5cfd4c9fff

+ 0 - 7
mapeditor/inspector/townbuildingswidget.cpp

@@ -332,11 +332,6 @@ void TownBuildingsDelegate::setEditorData(QWidget *editor, const QModelIndex &in
 	if(auto * ed = qobject_cast<TownBuildingsWidget *>(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)

+ 0 - 4
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())
 	{

+ 0 - 2
mapeditor/playerparams.cpp

@@ -80,8 +80,6 @@ PlayerParams::PlayerParams(MapController & ctrl, int playerId, QWidget *parent)
 		if(auto town = dynamic_cast<CGTownInstance*>(controller.map()->objects[i].get()))
 		{
 			auto * ctown = town->getTown();
-			if(!ctown)
-				ctown = VLC->townh->randomTown;
 
 			if(ctown && town->getOwner().getNum() == playerColor)
 			{