mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-15 00:05:02 +02:00
Merge beta -> develop
This commit is contained in:
@ -22,6 +22,7 @@
|
||||
#include "../../lib/CPathfinder.h"
|
||||
#include "../../lib/Point.h"
|
||||
#include "../../lib/mapObjects/CGHeroInstance.h"
|
||||
#include "../../lib/spells/CSpellHandler.h"
|
||||
#include "../../lib/mapping/CMap.h"
|
||||
|
||||
MapRendererBaseContext::MapRendererBaseContext(const MapRendererContextState & viewState)
|
||||
@ -199,6 +200,11 @@ bool MapRendererBaseContext::showBlocked() const
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MapRendererBaseContext::showSpellRange(const int3 & position) const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
MapRendererAdventureContext::MapRendererAdventureContext(const MapRendererContextState & viewState)
|
||||
: MapRendererBaseContext(viewState)
|
||||
{
|
||||
@ -266,6 +272,19 @@ bool MapRendererAdventureContext::showBlocked() const
|
||||
return settingShowBlocked;
|
||||
}
|
||||
|
||||
bool MapRendererAdventureContext::showSpellRange(const int3 & position) const
|
||||
{
|
||||
if (!settingSpellRange)
|
||||
return false;
|
||||
|
||||
auto hero = LOCPLINT->localState->getCurrentHero();
|
||||
|
||||
if (!hero)
|
||||
return false;
|
||||
|
||||
return !isInScreenRange(hero->getSightCenter(), position);
|
||||
}
|
||||
|
||||
MapRendererAdventureTransitionContext::MapRendererAdventureTransitionContext(const MapRendererContextState & viewState)
|
||||
: MapRendererAdventureContext(viewState)
|
||||
{
|
||||
|
Reference in New Issue
Block a user