games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Do not attempt to play animations when map is inactive

Browse Source
This commit is contained in:
Ivan Savenko
2023-03-31 20:00:54 +03:00
parent e3b1b0fbd6
commit 839172cd30
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/mapView/MapViewController.cpp
View File

@@ -18,6 +18,7 @@
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../adventureMap/CAdvMapInt.h" #include "../adventureMap/CAdvMapInt.h"
#include "../gui/CGuiHandler.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#include "../../lib/CPathfinder.h" #include "../../lib/CPathfinder.h"
@@ -206,6 +207,9 @@ bool MapViewController::isEventVisible(const CGObjectInstance * obj)
if(!LOCPLINT->makingTurn && settings["adventure"]["enemyMoveTime"].Float() < 0) if(!LOCPLINT->makingTurn && settings["adventure"]["enemyMoveTime"].Float() < 0)
return false; // enemy move speed set to "hidden/none" return false; // enemy move speed set to "hidden/none"
if(GH.topInt() != adventureInt)
return false;
if(obj->isVisitable()) if(obj->isVisitable())
return context->isVisible(obj->visitablePos()); return context->isVisible(obj->visitablePos());
else else
@@ -220,6 +224,9 @@ bool MapViewController::isEventVisible(const CGHeroInstance * obj, const int3 &
if(!LOCPLINT->makingTurn && settings["adventure"]["enemyMoveTime"].Float() < 0) if(!LOCPLINT->makingTurn && settings["adventure"]["enemyMoveTime"].Float() < 0)
return false; // enemy move speed set to "hidden/none" return false; // enemy move speed set to "hidden/none"
if(GH.topInt() != adventureInt)
return false;
if(context->isVisible(obj->convertToVisitablePos(from))) if(context->isVisible(obj->convertToVisitablePos(from)))
return true; return true;