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

Merge pull request #4481 from Laserlicht/fix_hota

Browse Source 
fix for 8th creature
This commit is contained in:
Ivan Savenko 2024-08-24 16:06:12 +03:00 committed by GitHub
commit 3e605253db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/windows/CCastleInterface.cpp
View File

@ -1894,8 +1894,9 @@ const CBuilding * CFortScreen::RecruitArea::getMyBuilding()
{ {
if (town->hasBuilt(myID)) if (town->hasBuilt(myID))
build = town->town->buildings.at(myID); build = town->town->buildings.at(myID);
myID.advance(town->town->creatures.size()); BuildingID::advanceDwelling(myID);
} }
return build; return build;
} }

8
lib/constants/EntityIdentifiers.h
View File

@ -352,6 +352,14 @@ public:
return (dwelling - DWELL_FIRST) / (GameConstants::CREATURES_PER_TOWN - 1); return (dwelling - DWELL_FIRST) / (GameConstants::CREATURES_PER_TOWN - 1);
} }
static void advanceDwelling(BuildingIDBase & dwelling)
{
if(dwelling != BuildingIDBase::DWELL_LVL_8)
dwelling.advance(GameConstants::CREATURES_PER_TOWN - 1);
else
dwelling.advance(1);
}
bool IsSpecialOrGrail() const bool IsSpecialOrGrail() const
{ {
return num == SPECIAL_1 || num == SPECIAL_2 || num == SPECIAL_3 || num == SPECIAL_4 || num == GRAIL; return num == SPECIAL_1 || num == SPECIAL_2 || num == SPECIAL_3 || num == SPECIAL_4 || num == GRAIL;