games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Implemented tracking of objects destroyed by players

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-31 01:37:33 +02:00
parent ccea7fc1fb
commit 2e4895766a
13 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/CQuest.cpp
View File

@@ -129,12 +129,12 @@ bool CQuest::checkQuest(const CGHeroInstance * h) const
if(!mission.heroAllowed(h))
return false;
if(killTarget != ObjectInstanceID::NONE)
if(killTarget.hasValue())
{
if(h->cb->getObjByQuestIdentifier(killTarget))
PlayerColor owner = h->getOwner();
if (!h->cb->getPlayerState(owner)->destroyedObjects.count(killTarget))
return false;
}
return true;
}
@@ -612,7 +612,7 @@ void CGSeerHut::onHeroVisit(const CGHeroInstance * h) const
int CGSeerHut::checkDirection() const
{
int3 cord = getCreatureToKill()->pos;
int3 cord = getCreatureToKill(false)->pos;
if(static_cast<double>(cord.x) / static_cast<double>(cb->getMapSize().x) < 0.34) //north
{
if(static_cast<double>(cord.y) / static_cast<double>(cb->getMapSize().y) < 0.34) //northwest
@@ -644,7 +644,7 @@ int CGSeerHut::checkDirection() const
const CGHeroInstance * CGSeerHut::getHeroToKill(bool allowNull) const
{
const CGObjectInstance *o = cb->getObjByQuestIdentifier(quest->killTarget);
const CGObjectInstance *o = cb->getObj(quest->killTarget);
if(allowNull && !o)
return nullptr;
return dynamic_cast<const CGHeroInstance *>(o);
@@ -652,7 +652,7 @@ const CGHeroInstance * CGSeerHut::getHeroToKill(bool allowNull) const
const CGCreature * CGSeerHut::getCreatureToKill(bool allowNull) const
{
const CGObjectInstance *o = cb->getObjByQuestIdentifier(quest->killTarget);
const CGObjectInstance *o = cb->getObj(quest->killTarget);
if(allowNull && !o)
return nullptr;
return dynamic_cast<const CGCreature *>(o);