Skip to content

Commit 0073313

Browse files
committed
Use updated CrimeExecution constructor for single stage init
1 parent 3acac67 commit 0073313

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

OPHD/States/MapViewState.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ const std::map<Difficulty, int> MapViewState::ColonyShipDeorbitMoraleLossMultipl
177177

178178
MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::string& savegame) :
179179
mCrimeRateUpdate{mDifficulty},
180-
mCrimeExecution{mDifficulty},
180+
mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
181181
mTechnologyReader{"tech0-1.xml"},
182182
mLoadingExisting{true},
183183
mExistingToLoad{savegame},
@@ -191,15 +191,14 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::stri
191191
{
192192
ccLocation() = CcNotPlaced;
193193
NAS2D::Utility<NAS2D::EventHandler>::get().windowResized().connect({this, &MapViewState::onWindowResized});
194-
mCrimeExecution.crimeEventSignal().connect({this, &MapViewState::onCrimeEvent});
195194
}
196195

197196

198197
MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty) :
199198
mDifficulty{selectedDifficulty},
200199
mTileMap{std::make_unique<TileMap>(planetAttributes.mapImagePath, planetAttributes.maxDepth, planetAttributes.maxMines, HostilityMineYields.at(planetAttributes.hostility))},
201200
mCrimeRateUpdate{mDifficulty},
202-
mCrimeExecution{mDifficulty},
201+
mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
203202
mTechnologyReader{"tech0-1.xml"},
204203
mPlanetAttributes{planetAttributes},
205204
mMainReportsState{mainReportsState},
@@ -218,7 +217,6 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::A
218217
setMeanSolarDistance(mPlanetAttributes.meanSolarDistance);
219218
ccLocation() = CcNotPlaced;
220219
NAS2D::Utility<NAS2D::EventHandler>::get().windowResized().connect({this, &MapViewState::onWindowResized});
221-
mCrimeExecution.crimeEventSignal().connect({this, &MapViewState::onCrimeEvent});
222220
}
223221

224222

0 commit comments

Comments
 (0)