games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

vcmi: expert dispel now works mechanically correct

Browse Source
This commit is contained in:
Konstantin
2023-03-21 02:42:02 +03:00
parent 1b893fa525
commit 26db14b7b4
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/battle/CBattleInfoEssentials.cpp
View File

@ -47,10 +47,7 @@ std::vector<std::shared_ptr<const CObstacleInstance>> CBattleInfoEssentials::bat
else else
{ {
if(!!player && *perspective != battleGetMySide()) if(!!player && *perspective != battleGetMySide())
{ logGlobal->warn("Unauthorized obstacles access attempt, assuming massive spell");
logGlobal->error("Unauthorized obstacles access attempt!");
return ret;
}
} }
for(const auto & obstacle : getBattle()->getAllObstacles()) for(const auto & obstacle : getBattle()->getAllObstacles())

7
lib/spells/effects/Obstacle.cpp
View File

@ -273,12 +273,7 @@ void Obstacle::placeObstacles(ServerCallback * server, const Mechanics * m, cons
BattleObstaclesChanged pack; BattleObstaclesChanged pack;
boost::optional<BattlePerspective::BattlePerspective> perspective; auto all = m->battle()->battleGetAllObstacles(BattlePerspective::ALL_KNOWING);
if(!m->battle()->getPlayerID())
perspective = boost::make_optional(BattlePerspective::ALL_KNOWING);
auto all = m->battle()->battleGetAllObstacles(perspective);
int obstacleIdToGive = 1; int obstacleIdToGive = 1;
for(auto & one : all) for(auto & one : all)

2
lib/spells/effects/RemoveObstacle.cpp
View File

@ -89,7 +89,7 @@ std::set<const CObstacleInstance *> RemoveObstacle::getTargets(const Mechanics *
std::set<const CObstacleInstance *> possibleTargets; std::set<const CObstacleInstance *> possibleTargets;
if(m->isMassive() || alwaysMassive) if(m->isMassive() || alwaysMassive)
{ {
for(const auto & obstacle : m->battle()->battleGetAllObstacles()) for(const auto & obstacle : m->battle()->battleGetAllObstacles(BattlePerspective::ALL_KNOWING))
if(canRemove(obstacle.get())) if(canRemove(obstacle.get()))
possibleTargets.insert(obstacle.get()); possibleTargets.insert(obstacle.get());
} }