From bd488db8ef110a394e3d9f161b3897369d30721f Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Fri, 22 May 2026 21:34:21 +0200 Subject: [PATCH] remove unused building HP --- src/balancing/ArenaView.cpp | 2 +- src/lib/sim/Building.h | 2 -- src/lib/sim/BuildingSystem.cpp | 7 +------ src/lib/sim/BuildingSystem.h | 3 +-- src/lib/sim/Simulation.cpp | 2 +- src/test/ShipModuleTest.cpp | 3 +-- src/test/ShipyardTest.cpp | 3 +-- src/test/WaveSystemTest.cpp | 11 ++++------- 8 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/balancing/ArenaView.cpp b/src/balancing/ArenaView.cpp index b1a0b4a..d47c44e 100644 --- a/src/balancing/ArenaView.cpp +++ b/src/balancing/ArenaView.cpp @@ -145,7 +145,7 @@ void ArenaView::paintGL() drawTiles(painter); drawBuildings(painter); - //drawStations(painter); + drawStations(painter); drawScrap(painter); drawShips(painter); drawBeams(painter); diff --git a/src/lib/sim/Building.h b/src/lib/sim/Building.h index 525dd63..47af6f3 100644 --- a/src/lib/sim/Building.h +++ b/src/lib/sim/Building.h @@ -75,8 +75,6 @@ struct Building QSize footprint; Rotation rotation = Rotation::East; BuildingType type = BuildingType::Miner; - float hp = 0.0f; - float maxHp = 0.0f; std::string recipeId; // empty = none selected InputBuffer inputBuffer; diff --git a/src/lib/sim/BuildingSystem.cpp b/src/lib/sim/BuildingSystem.cpp index 37f710e..ce54cde 100644 --- a/src/lib/sim/BuildingSystem.cpp +++ b/src/lib/sim/BuildingSystem.cpp @@ -445,8 +445,6 @@ void BuildingSystem::tickConstruction(Tick currentTick) building.footprint = front.footprint; building.rotation = front.rotation; building.type = front.type; - building.hp = 100.0f; - building.maxHp = 100.0f; building.recipeId = front.recipeId; building.shipLayout = front.shipLayout; @@ -1049,8 +1047,7 @@ bool BuildingSystem::deliverScrapToSalvageBay(EntityId bayId) EntityId BuildingSystem::placeImmediate(BuildingType type, const std::vector& surfaceMask, - QPoint anchor, Rotation rotation, - float hp, float maxHp) + QPoint anchor, Rotation rotation) { const EntityId id = m_allocateId(); const ParsedSurfaceMask mask = parseSurfaceMask(surfaceMask, rotation); @@ -1061,8 +1058,6 @@ EntityId BuildingSystem::placeImmediate(BuildingType type, building.footprint = mask.footprint; building.rotation = rotation; building.type = type; - building.hp = hp; - building.maxHp = maxHp; for (const QPoint& cell : mask.bodyCells) { diff --git a/src/lib/sim/BuildingSystem.h b/src/lib/sim/BuildingSystem.h index e85d0f8..8cb9c81 100644 --- a/src/lib/sim/BuildingSystem.h +++ b/src/lib/sim/BuildingSystem.h @@ -109,8 +109,7 @@ public: // surfaceMask comes from the relevant config struct. EntityId placeImmediate(BuildingType type, const std::vector& surfaceMask, - QPoint anchor, Rotation rotation, - float hp, float maxHp); + QPoint anchor, Rotation rotation); // Remove an operational building by id without refund (used for deaths). // Returns true if found and removed. diff --git a/src/lib/sim/Simulation.cpp b/src/lib/sim/Simulation.cpp index 77ee09a..a6955e8 100644 --- a/src/lib/sim/Simulation.cpp +++ b/src/lib/sim/Simulation.cpp @@ -208,7 +208,7 @@ void Simulation::placeInitialStructures() BuildingType::Hq, m_config.stations.hq.surfaceMask, QPoint(hqAnchorX, hqAnchorY), - Rotation::East, hqHp, hqHp); + Rotation::East); const QVector2D hqCenter( hqAnchorX + hqParsed.footprint.width() / 2.0f, diff --git a/src/test/ShipModuleTest.cpp b/src/test/ShipModuleTest.cpp index 8e36174..137d457 100644 --- a/src/test/ShipModuleTest.cpp +++ b/src/test/ShipModuleTest.cpp @@ -51,8 +51,7 @@ static EntityId placeShipyard(Simulation& sim, const BuildingDef& yardDef) BuildingType::Shipyard, yardDef.surfaceMask, QPoint(0, 0), - Rotation::East, - 100.0f, 100.0f); + Rotation::East); } static void fillMaterials(Simulation& sim, EntityId yardId, diff --git a/src/test/ShipyardTest.cpp b/src/test/ShipyardTest.cpp index 6e82425..21dfcc4 100644 --- a/src/test/ShipyardTest.cpp +++ b/src/test/ShipyardTest.cpp @@ -49,8 +49,7 @@ static EntityId placeShipyard(Simulation& sim, const BuildingDef& yardDef) BuildingType::Shipyard, yardDef.surfaceMask, QPoint(0, 0), - Rotation::East, - 100.0f, 100.0f); + Rotation::East); } static int countShips(Simulation& sim) diff --git a/src/test/WaveSystemTest.cpp b/src/test/WaveSystemTest.cpp index 024780c..4af31ca 100644 --- a/src/test/WaveSystemTest.cpp +++ b/src/test/WaveSystemTest.cpp @@ -132,15 +132,12 @@ TEST_CASE("WaveSystem: HQ has correct initial HP from config", "[wave]") static_cast(sim.config().stations.hq.hpFormula.evaluate(0.0)); bool found = false; float actualHp = 0.0f; - for (const Building& b : sim.buildings().allBuildings()) - { - if (b.type == BuildingType::Hq) + sim.admin().forEach( + [&](entt::entity /*e*/, const HqProxy& /*hq*/, const Health& h) { found = true; - actualHp = b.hp; - break; - } - } + actualHp = h.hp; + }); REQUIRE(found); REQUIRE(actualHp == Approx(expectedHp));