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

Merge pull request #1508 from kambala-decapitator/shipyard-regression

Browse Source 
attempt to show shipyard dialog only when a hero is selected
This commit is contained in:
Ivan Savenko
2023-01-28 02:04:10 +02:00
committed by GitHub
parent c2c08a46bf 612b5e2746
commit 7bbaae75a2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/CAdvmapInterface.cpp
View File

@@ -1584,6 +1584,7 @@ void CAdvMapInt::tileLClicked(const int3 &mapPos)
bool canSelect = topBlocking && topBlocking->ID == Obj::HERO && topBlocking->tempOwner == LOCPLINT->playerID; bool canSelect = topBlocking && topBlocking->ID == Obj::HERO && topBlocking->tempOwner == LOCPLINT->playerID;
canSelect |= topBlocking && topBlocking->ID == Obj::TOWN && LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, topBlocking->tempOwner); canSelect |= topBlocking && topBlocking->ID == Obj::TOWN && LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, topBlocking->tempOwner);
bool isHero = false;
if(selection->ID != Obj::HERO) //hero is not selected (presumably town) if(selection->ID != Obj::HERO) //hero is not selected (presumably town)
{ {
assert(!terrain.currentPath); //path can be active only when hero is selected assert(!terrain.currentPath); //path can be active only when hero is selected
@@ -1594,6 +1595,8 @@ void CAdvMapInt::tileLClicked(const int3 &mapPos)
} }
else if(const CGHeroInstance * currentHero = curHero()) //hero is selected else if(const CGHeroInstance * currentHero = curHero()) //hero is selected
{ {
isHero = true;
const CGPathNode *pn = LOCPLINT->cb->getPathsInfo(currentHero)->getPathInfo(mapPos); const CGPathNode *pn = LOCPLINT->cb->getPathsInfo(currentHero)->getPathInfo(mapPos);
if(currentHero == topBlocking) //clicked selected hero if(currentHero == topBlocking) //clicked selected hero
{ {
@@ -1635,7 +1638,8 @@ void CAdvMapInt::tileLClicked(const int3 &mapPos)
throw std::runtime_error("Nothing is selected..."); throw std::runtime_error("Nothing is selected...");
} }
if(const IShipyard *shipyard = ourInaccessibleShipyard(topBlocking)) const auto shipyard = ourInaccessibleShipyard(topBlocking);
if(isHero && shipyard != nullptr)
{ {
LOCPLINT->showShipyardDialogOrProblemPopup(shipyard); LOCPLINT->showShipyardDialogOrProblemPopup(shipyard);
} }