migrate every factory query off BuildingSystem onto the free functions
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
#include "Simulation.h"
|
||||
|
||||
#include "FactoryQueries.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
@@ -811,12 +813,12 @@ double Simulation::getThreatAccumulationRate() const
|
||||
|
||||
double Simulation::getMaxFactoryProductionThreatRate() const
|
||||
{
|
||||
return static_cast<double>(m_buildingSystem->getProductionBuildingCount());
|
||||
return static_cast<double>(getProductionBuildingCount(m_factoryState));
|
||||
}
|
||||
|
||||
double Simulation::getCurrentFactoryProductionThreatRate() const
|
||||
{
|
||||
return static_cast<double>(m_buildingSystem->getActiveProductionBuildingCount());
|
||||
return static_cast<double>(getActiveProductionBuildingCount(m_factoryState));
|
||||
}
|
||||
|
||||
int Simulation::getBossWaveCounter() const
|
||||
@@ -895,6 +897,11 @@ BuildingSystem& Simulation::getBuildingsMutable()
|
||||
return *m_buildingSystem;
|
||||
}
|
||||
|
||||
const FactoryState& Simulation::getFactoryState() const
|
||||
{
|
||||
return m_factoryState;
|
||||
}
|
||||
|
||||
const BuildingSystem& Simulation::getBuildings() const
|
||||
{
|
||||
return *m_buildingSystem;
|
||||
|
||||
Reference in New Issue
Block a user