Browse Source

Do not update minimap using puzzle map data

Ivan Savenko 2 years ago
parent
commit
d3c1c92a03
2 changed files with 3 additions and 2 deletions
  1. 2 1
      client/mapView/MapView.cpp
  2. 1 1
      client/mapView/MapViewController.cpp

+ 2 - 1
client/mapView/MapView.cpp

@@ -160,6 +160,7 @@ void MapView::onViewMapActivated()
 PuzzleMapView::PuzzleMapView(const Point & offset, const Point & dimensions, const int3 & tileToCenter)
 PuzzleMapView::PuzzleMapView(const Point & offset, const Point & dimensions, const int3 & tileToCenter)
 	: BasicMapView(offset, dimensions)
 	: BasicMapView(offset, dimensions)
 {
 {
-	controller->setViewCenter(tileToCenter);
 	controller->activatePuzzleMapContext(tileToCenter);
 	controller->activatePuzzleMapContext(tileToCenter);
+	controller->setViewCenter(tileToCenter);
+
 }
 }

+ 1 - 1
client/mapView/MapViewController.cpp

@@ -63,7 +63,7 @@ void MapViewController::setViewCenter(const Point & position, int level)
 	model->setViewCenter(betterPosition);
 	model->setViewCenter(betterPosition);
 	model->setLevel(vstd::clamp(level, 0, context->getMapSize().z));
 	model->setLevel(vstd::clamp(level, 0, context->getMapSize().z));
 
 
-	if(adventureInt) // may be called before adventureInt is initialized
+	if(adventureInt && !puzzleMapContext) // may be called before adventureInt is initialized
 		adventureInt->onMapViewMoved(model->getTilesTotalRect(), model->getLevel());
 		adventureInt->onMapViewMoved(model->getTilesTotalRect(), model->getLevel());
 }
 }