Skip to content

Commit 4c6320c

Browse files
committed
Corrected MapViewState constructor Init list ordering of initializations
1 parent 684e3de commit 4c6320c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

OPHD/States/MapViewState.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::stri
167167
mStructures{"ui/structures.png", 46, constants::MarginTight},
168168
mRobots{"ui/robots.png", 46, constants::MarginTight},
169169
mConnections{"ui/structures.png", 46, constants::MarginTight},
170+
mPopulationPanel{mPopulation, mPopulationPool},
170171
mResourceInfoBar{mResourcesCount, mPopulation, mCurrentMorale, mPreviousMorale, mFood},
171-
mRobotDeploymentSummary{mRobotPool},
172-
mPopulationPanel{mPopulation, mPopulationPool}
172+
mRobotDeploymentSummary{mRobotPool}
173173
{
174174
ccLocation() = CcNotPlaced;
175175
NAS2D::Utility<NAS2D::EventHandler>::get().windowResized().connect({this, &MapViewState::onWindowResized});
@@ -183,12 +183,12 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::A
183183
mPlanetAttributes(planetAttributes),
184184
mCurrentMorale{constants::DefaultStartingMorale},
185185
mPreviousMorale{constants::DefaultStartingMorale},
186-
mPopulationPanel{mPopulation, mPopulationPool},
187186
mMainReportsState(mainReportsState),
188187
mMapView{std::make_unique<MapView>(*mTileMap)},
189188
mStructures{"ui/structures.png", 46, constants::MarginTight},
190189
mRobots{"ui/robots.png", 46, constants::MarginTight},
191190
mConnections{"ui/structures.png", 46, constants::MarginTight},
191+
mPopulationPanel{mPopulation, mPopulationPool},
192192
mResourceInfoBar{mResourcesCount, mPopulation, mCurrentMorale, mPreviousMorale, mFood},
193193
mRobotDeploymentSummary{mRobotPool},
194194
mMiniMap{std::make_unique<MiniMap>(*mMapView, mTileMap, mRobotList, planetAttributes.mapImagePath)},

0 commit comments

Comments
 (0)