games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-15 13:46:54 +03:00
parent 6aadcf43d3
commit a13806a0df
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/callback/CGameInfoCallback.cpp
View File

@@ -184,7 +184,6 @@ void CGameInfoCallback::fillUpgradeInfo(const CArmedInstance *obj, SlotID stackP
{
ERROR_RET_IF(!canGetFullInfo(obj), "Cannot get info about not owned object!");
ERROR_RET_IF(!obj->hasStackAtSlot(stackPos), "There is no such stack!");
gameState().fillUpgradeInfo(obj, stackPos, out);
const auto & stack = obj->getStack(stackPos);
const CCreature *base = stack.getCreature();
@@ -451,9 +450,9 @@ bool CGameInfoCallback::isVisibleFor(int3 pos, PlayerColor player) const
bool CGameInfoCallback::isVisible(int3 pos) const
{
return getPlayerID().has_value() ?
gameState().isVisibleFor(pos, *getPlayerID()):
gameState().isVisible(pos);
if (!getPlayerID().has_value())
return true; // weird, but we do have such calls
return gameState().isVisibleFor(pos, *getPlayerID());
}
bool CGameInfoCallback::isVisibleFor(const CGObjectInstance * obj, PlayerColor player) const
@@ -463,9 +462,9 @@ bool CGameInfoCallback::isVisibleFor(const CGObjectInstance * obj, PlayerColor p
bool CGameInfoCallback::isVisible(const CGObjectInstance *obj) const
{
return getPlayerID().has_value() ?
gameState().isVisibleFor(obj, *getPlayerID()):
gameState().isVisible(obj);
if (!getPlayerID().has_value())
return true; // weird, but we do have such calls
return gameState().isVisibleFor(obj, *getPlayerID());
}
std::vector <const CGObjectInstance *> CGameInfoCallback::getBlockingObjs( int3 pos ) const

2
server/CGameHandler.h
View File

@@ -173,7 +173,7 @@ public:
/// Returns hero that is currently visiting this object, or nullptr if no visit is active
const CGHeroInstance * getVisitingHero(const CGObjectInstance *obj);
const CGObjectInstance * getVisitingObject(const CGHeroInstance *hero);
bool isVisitCoveredByAnotherQuery(const CGObjectInstance *obj, const CGHeroInstance *hero);
bool isVisitCoveredByAnotherQuery(const CGObjectInstance *obj, const CGHeroInstance *hero) override;
void setObjPropertyValue(ObjectInstanceID objid, ObjProperty prop, int32_t value) override;
void setObjPropertyID(ObjectInstanceID objid, ObjProperty prop, ObjPropertyID identifier) override;
void setRewardableObjectConfiguration(ObjectInstanceID objid, const Rewardable::Configuration & configuration) override;