rename EntityId to BuildingId

This commit is contained in:
2026-05-23 07:53:56 +02:00
parent dc4ebd5f2d
commit b57299fd2a
28 changed files with 273 additions and 274 deletions

View File

@@ -86,7 +86,7 @@ SelectedBuildingPanel::SelectedBuildingPanel(Simulation* sim,
: QWidget(parent)
, m_sim(sim)
, m_config(config)
, m_singleId(kInvalidEntityId)
, m_singleBuildingId(kInvalidBuildingId)
, m_splitterTile(0, 0)
{
m_layout = new QVBoxLayout(this);
@@ -125,9 +125,9 @@ SelectedBuildingPanel::SelectedBuildingPanel(Simulation* sim,
connect(m_clearBeltBtn, &QPushButton::clicked,
this, &SelectedBuildingPanel::onClearBelt);
connect(m_configureLayoutBtn, &QPushButton::clicked, this, [this]() {
if (m_singleId != kInvalidEntityId)
if (m_singleBuildingId != kInvalidBuildingId)
{
emit layoutDialogRequested(m_singleId);
emit layoutDialogRequested(m_singleBuildingId);
}
});
connect(m_filterAList, &QListWidget::itemChanged,
@@ -138,31 +138,31 @@ SelectedBuildingPanel::SelectedBuildingPanel(Simulation* sim,
buildEmpty();
}
void SelectedBuildingPanel::onSelectionChanged(const std::vector<EntityId>& ids)
void SelectedBuildingPanel::onSelectionChanged(const std::vector<BuildingId>& ids)
{
m_selection = ids;
m_selectedBuildingIds = ids;
rebuild();
}
void SelectedBuildingPanel::rebuild()
{
if (m_selection.empty())
if (m_selectedBuildingIds.empty())
{
buildEmpty();
}
else if (m_selection.size() == 1)
else if (m_selectedBuildingIds.size() == 1)
{
buildSingle(m_selection[0]);
buildSingle(m_selectedBuildingIds[0]);
}
else
{
buildMulti(m_selection);
buildMulti(m_selectedBuildingIds);
}
}
void SelectedBuildingPanel::buildEmpty()
{
m_singleId = kInvalidEntityId;
m_singleBuildingId = kInvalidBuildingId;
m_titleLabel->hide();
m_recipeCombo->hide();
m_layoutPreview->hide();
@@ -175,9 +175,9 @@ void SelectedBuildingPanel::buildEmpty()
m_buffersLabel->hide();
}
void SelectedBuildingPanel::buildSingle(EntityId id)
void SelectedBuildingPanel::buildSingle(BuildingId id)
{
m_singleId = id;
m_singleBuildingId = id;
const Building* b = m_sim->buildings().findBuilding(id);
if (!b)
@@ -490,8 +490,8 @@ const ShipDef* SelectedBuildingPanel::findShipDef(const std::string& id) const
void SelectedBuildingPanel::onStateUpdated(Tick /*tick*/, int /*blocks*/, double /*speed*/)
{
if (m_singleId == kInvalidEntityId) { return; }
const Building* b = m_sim->buildings().findBuilding(m_singleId);
if (m_singleBuildingId == kInvalidBuildingId) { return; }
const Building* b = m_sim->buildings().findBuilding(m_singleBuildingId);
if (b)
{
// If the panel was last showing this id as a construction site, the
@@ -506,7 +506,7 @@ void SelectedBuildingPanel::onStateUpdated(Tick /*tick*/, int /*blocks*/, double
}
return;
}
const ConstructionSite* s = m_sim->buildings().findSite(m_singleId);
const ConstructionSite* s = m_sim->buildings().findSite(m_singleBuildingId);
if (s)
{
rebuild();
@@ -515,9 +515,9 @@ void SelectedBuildingPanel::onStateUpdated(Tick /*tick*/, int /*blocks*/, double
buildEmpty();
}
void SelectedBuildingPanel::buildMulti(const std::vector<EntityId>& ids)
void SelectedBuildingPanel::buildMulti(const std::vector<BuildingId>& ids)
{
m_singleId = kInvalidEntityId;
m_singleBuildingId = kInvalidBuildingId;
m_recipeCombo->hide();
m_clearBeltBtn->hide();
m_filterALabel->hide();
@@ -527,7 +527,7 @@ void SelectedBuildingPanel::buildMulti(const std::vector<EntityId>& ids)
m_buffersLabel->hide();
std::map<BuildingType, int> counts;
for (EntityId id : ids)
for (BuildingId id : ids)
{
const Building* b = m_sim->buildings().findBuilding(id);
if (b)
@@ -564,12 +564,12 @@ void SelectedBuildingPanel::buildMulti(const std::vector<EntityId>& ids)
void SelectedBuildingPanel::onRecipeChanged(int comboIndex)
{
if (m_singleId == kInvalidEntityId)
if (m_singleBuildingId == kInvalidBuildingId)
{
return;
}
const QString recipeId = m_recipeCombo->itemData(comboIndex).toString();
m_sim->buildings().setRecipe(m_singleId, recipeId.toStdString());
m_sim->buildings().setRecipe(m_singleBuildingId, recipeId.toStdString());
rebuild();
}
@@ -619,7 +619,7 @@ void SelectedBuildingPanel::buildSplitterFilters(QPoint splitterTile)
void SelectedBuildingPanel::onSplitterFilterChanged()
{
if (m_singleId == kInvalidEntityId)
if (m_singleBuildingId == kInvalidBuildingId)
{
return;
}
@@ -664,7 +664,7 @@ std::vector<std::string> SelectedBuildingPanel::allItemIds() const
void SelectedBuildingPanel::onClearBelt()
{
std::vector<QPoint> tiles;
for (EntityId id : m_selection)
for (BuildingId id : m_selectedBuildingIds)
{
const Building* b = m_sim->buildings().findBuilding(id);
if (b && isBeltLike(b->type))