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

fix upgrade

Browse Source
This commit is contained in:
Laserlicht
2024-08-06 23:28:45 +02:00
parent 758617e2df
commit 14bcfad7b0
6 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/windows/CCastleInterface.cpp
View File

@@ -163,7 +163,7 @@ void CBuildingRect::showPopupWindow(const Point & cursorPosition)
}
else
{
int level = BuildingID::getLevel(bid) % bld->town->creatures.size();
int level = BuildingID::getLevelFromDwelling(bid);
GH.windows().createAndPushWindow<CDwellingInfoBox>(parent->pos.x+parent->pos.w / 2, parent->pos.y+parent->pos.h /2, town, level);
}
}
@@ -688,7 +688,7 @@ void CCastleBuildings::buildingClicked(BuildingID building, BuildingSubID::EBuil
if (building >= BuildingID::DWELL_FIRST)
{
enterDwelling((BuildingID::getLevel(building))%town->town->creatures.size());
enterDwelling((BuildingID::getLevelFromDwelling(building)));
}
else
{
@@ -1771,12 +1771,12 @@ CFortScreen::CFortScreen(const CGTownInstance * town):
BuildingID buildingID;
if(fortSize == town->town->creatures.size())
{
BuildingID dwelling = BuildingID::getDwelling(i, true);
BuildingID dwelling = BuildingID::getDwellingFromLevel(i, true);
if(vstd::contains(town->builtBuildings, dwelling))
buildingID = BuildingID(BuildingID::getDwelling(i, true));
buildingID = BuildingID(BuildingID::getDwellingFromLevel(i, true));
else
buildingID = BuildingID(BuildingID::getDwelling(i));
buildingID = BuildingID(BuildingID::getDwellingFromLevel(i));
}
else
{
@@ -1878,7 +1878,7 @@ const CCreature * CFortScreen::RecruitArea::getMyCreature()
const CBuilding * CFortScreen::RecruitArea::getMyBuilding()
{
BuildingID myID = BuildingID(BuildingID::getDwelling(level));
BuildingID myID = BuildingID(BuildingID::getDwellingFromLevel(level));
if (level == town->town->creatures.size())
return town->town->getSpecialBuilding(BuildingSubID::PORTAL_OF_SUMMONING);