Renamed mNewMapView to mNewMapViewState

Author: oscar139

appOPHD/States/GameState.cpp

@@ -166,7 +166,7 @@ void GameState::onLoadGame(const std::string& saveGameName)
 		}
 		auto newMapView = std::make_unique<MapViewState>(*mMainReportsState.get(), saveGamePath);
 		newMapView->initialize();
-		mNewMapView = std::move(newMapView);
+		mNewMapViewState = std::move(newMapView);
 	}
 	catch (const std::exception& e)
 	{
@@ -204,9 +204,9 @@ NAS2D::State* GameState::update()
 		mReturnState = new MainMenuState();
 	}
 
-	if (mNewMapView)
+	if (mNewMapViewState)
 	{
-		mMapViewState = std::move(mNewMapView);
+		mMapViewState = std::move(mNewMapViewState);
 		initializeMapViewState();
 	}
 

appOPHD/States/GameState.h

@@ -50,7 +50,7 @@ class GameState : public NAS2D::State
 private:
 	std::unique_ptr<MainReportsUiState> mMainReportsState;
 	std::unique_ptr<MapViewState> mMapViewState;
-	std::unique_ptr<MapViewState> mNewMapView;
+	std::unique_ptr<MapViewState> mNewMapViewState;
 	Wrapper* mActiveState = nullptr;
 	NAS2D::State* mReturnState = this;
 	NAS2D::Fade mFade;