Browse Source

Fix map freeze on enemy turn

Ivan Savenko 2 years ago
parent
commit
be2e101c8c
2 changed files with 4 additions and 2 deletions
  1. 4 0
      client/adventureMap/AdventureMapInterface.cpp
  2. 0 2
      client/mapView/MapView.cpp

+ 4 - 0
client/adventureMap/AdventureMapInterface.cpp

@@ -147,6 +147,10 @@ void AdventureMapInterface::show(SDL_Surface * to)
 void AdventureMapInterface::tick(uint32_t msPassed)
 {
 	handleMapScrollingUpdate(msPassed);
+
+	// we want animations to be active during enemy turn but map itself to be non-interactive
+	// so call timer update directly on inactive element
+	widget->getMapView()->tick(msPassed);
 }
 
 void AdventureMapInterface::handleMapScrollingUpdate(uint32_t timePassed)

+ 0 - 2
client/mapView/MapView.cpp

@@ -55,8 +55,6 @@ BasicMapView::BasicMapView(const Point & offset, const Point & dimensions)
 	pos += offset;
 	pos.w = dimensions.x;
 	pos.h = dimensions.y;
-
-	addUsedEvents(TIME);
 }
 
 void BasicMapView::render(Canvas & target, bool fullUpdate)