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

Do not build pseudo-buildings explicitly with events

Browse Source
This commit is contained in:
Dydzio
2019-06-04 22:29:07 +02:00
parent b16af04a09
commit 2f15ca9406
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapping/MapFormatH3M.cpp
View File

@ -2104,7 +2104,6 @@ std::set<BuildingID> CMapLoaderH3M::convertBuildings(const std::set<BuildingID>
{ {
//village hall is always present //village hall is always present
ret.insert(BuildingID::VILLAGE_HALL); ret.insert(BuildingID::VILLAGE_HALL);
}
if(ret.find(BuildingID::CITY_HALL) != ret.end()) if(ret.find(BuildingID::CITY_HALL) != ret.end())
{ {
@ -2118,6 +2117,7 @@ std::set<BuildingID> CMapLoaderH3M::convertBuildings(const std::set<BuildingID>
{ {
ret.insert(BuildingID::EXTRA_CAPITOL); ret.insert(BuildingID::EXTRA_CAPITOL);
} }
}
return ret; return ret;
} }

2
server/CGameHandler.cpp
View File

@ -3009,7 +3009,7 @@ bool CGameHandler::buildStructure(ObjectInstanceID tid, BuildingID requestedID,
if (!t) if (!t)
COMPLAIN_RETF("No such town (ID=%s)!", tid); COMPLAIN_RETF("No such town (ID=%s)!", tid);
if (!t->town->buildings.count(requestedID)) if (!t->town->buildings.count(requestedID))
COMPLAIN_RETF("Town of faction %s does not have info about building ID=%s!", t->town->faction->name % tid); COMPLAIN_RETF("Town of faction %s does not have info about building ID=%s!", t->town->faction->name % requestedID);
if (t->hasBuilt(requestedID)) if (t->hasBuilt(requestedID))
COMPLAIN_RETF("Building %s is already built in %s", t->town->buildings.at(requestedID)->Name() % t->name); COMPLAIN_RETF("Building %s is already built in %s", t->town->buildings.at(requestedID)->Name() % t->name);