Преглед изворни кода

Fix movement animation on revealing FoW

Ivan Savenko пре 2 година
родитељ
комит
f988a67fbf
1 измењених фајлова са 22 додато и 27 уклоњено
  1. 22 27
      client/CPlayerInterface.cpp

+ 22 - 27
client/CPlayerInterface.cpp

@@ -372,13 +372,12 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details, bool verbose)
 		}
 	}
 
-	if(details.stopMovement()) //hero failed to move
-	{
-		stillMoveHero.setn(STOP_MOVE);
-		GH.totalRedraw();
-		adventureInt->heroList->update(hero);
-		return;
-	}
+	if(details.stopMovement()) //hero failed to move
+	{
+		stillMoveHero.setn(STOP_MOVE);
+		adventureInt->heroList->update(hero);
+		return;
+	}
 
 	adventureInt->heroList->redraw();
 
@@ -1202,26 +1201,22 @@ void CPlayerInterface::showMapObjectSelectDialog(QueryID askID, const Component
 	GH.pushInt(wnd);
 }
 
-void CPlayerInterface::tileRevealed(const std::unordered_set<int3, ShashInt3> &pos)
-{
-	EVENT_HANDLER_CALLED_BY_CLIENT;
-	//FIXME: wait for dialog? Magi hut/eye would benefit from this but may break other areas
-	for (auto & po : pos)
-		adventureInt->minimap->updateTile(po);
-	if (!pos.empty())
-		GH.totalRedraw();
-}
-
-void CPlayerInterface::tileHidden(const std::unordered_set<int3, ShashInt3> &pos)
-{
-	EVENT_HANDLER_CALLED_BY_CLIENT;
-	for (auto & po : pos)
-		adventureInt->minimap->updateTile(po);
-	if (!pos.empty())
-		GH.totalRedraw();
-}
-
-void CPlayerInterface::openHeroWindow(const CGHeroInstance *hero)
+void CPlayerInterface::tileRevealed(const std::unordered_set<int3, ShashInt3> &pos)
+{
+	EVENT_HANDLER_CALLED_BY_CLIENT;
+	//FIXME: wait for dialog? Magi hut/eye would benefit from this but may break other areas
+	for (auto & po : pos)
+		adventureInt->minimap->updateTile(po);
+}
+
+void CPlayerInterface::tileHidden(const std::unordered_set<int3, ShashInt3> &pos)
+{
+	EVENT_HANDLER_CALLED_BY_CLIENT;
+	for (auto & po : pos)
+		adventureInt->minimap->updateTile(po);
+}
+
+void CPlayerInterface::openHeroWindow(const CGHeroInstance *hero)
 {
 	boost::unique_lock<boost::recursive_mutex> un(*pim);
 	GH.pushIntT<CHeroWindow>(hero);