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

Merge pull request #3774 from Laserlicht/fix_city_gate

Browse Source 
fix city gate
This commit is contained in:
Ivan Savenko 2024-04-18 15:09:53 +03:00 committed by GitHub
commit 3724742247
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/windows/CCastleInterface.cpp
View File

@ -863,6 +863,7 @@ void CCastleBuildings::enterCastleGate()
return;//only visiting hero can use castle gates return;//only visiting hero can use castle gates
} }
std::vector <int> availableTowns; std::vector <int> availableTowns;
std::vector<std::shared_ptr<IImage>> images;
std::vector <const CGTownInstance*> Towns = LOCPLINT->localState->getOwnedTowns(); std::vector <const CGTownInstance*> Towns = LOCPLINT->localState->getOwnedTowns();
for(auto & Town : Towns) for(auto & Town : Towns)
{ {
@ -872,23 +873,19 @@ void CCastleBuildings::enterCastleGate()
t->hasBuilt(BuildingSubID::CASTLE_GATE)) //and the town has a castle gate t->hasBuilt(BuildingSubID::CASTLE_GATE)) //and the town has a castle gate
{ {
availableTowns.push_back(t->id.getNum());//add to the list availableTowns.push_back(t->id.getNum());//add to the list
if(settings["general"]["enableUiEnhancements"].Bool())
{
std::shared_ptr<CAnimation> a = GH.renderHandler().loadAnimation(AnimationPath::builtin("ITPA"));
a->preload();
images.push_back(a->getImage(t->town->clientInfo.icons[t->hasFort()][false] + 2)->scaleFast(Point(35, 23)));
}
} }
} }
std::vector<std::shared_ptr<IImage>> images;
for(auto & t : Towns)
{
if(!settings["general"]["enableUiEnhancements"].Bool())
break;
std::shared_ptr<CAnimation> a = GH.renderHandler().loadAnimation(AnimationPath::builtin("ITPA"));
a->preload();
images.push_back(a->getImage(t->town->clientInfo.icons[t->hasFort()][false] + 2)->scaleFast(Point(35, 23)));
}
auto gateIcon = std::make_shared<CAnimImage>(town->town->clientInfo.buildingsIcons, BuildingID::CASTLE_GATE);//will be deleted by selection window auto gateIcon = std::make_shared<CAnimImage>(town->town->clientInfo.buildingsIcons, BuildingID::CASTLE_GATE);//will be deleted by selection window
auto wnd = std::make_shared<CObjectListWindow>(availableTowns, gateIcon, CGI->generaltexth->jktexts[40], auto wnd = std::make_shared<CObjectListWindow>(availableTowns, gateIcon, CGI->generaltexth->jktexts[40],
CGI->generaltexth->jktexts[41], std::bind (&CCastleInterface::castleTeleport, LOCPLINT->castleInt, _1), 0, images); CGI->generaltexth->jktexts[41], std::bind (&CCastleInterface::castleTeleport, LOCPLINT->castleInt, _1), 0, images);
wnd->onPopup = [Towns](int index) { CRClickPopup::createAndPush(Towns[index], GH.getCursorPosition()); }; wnd->onPopup = [availableTowns](int index) { CRClickPopup::createAndPush(LOCPLINT->cb->getObjInstance(ObjectInstanceID(availableTowns[index])), GH.getCursorPosition()); };
GH.windows().pushWindow(wnd); GH.windows().pushWindow(wnd);
} }