games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4

Browse Source 
# Conflicts:
#	lib/mapObjects/CGObjectInstance.cpp
This commit is contained in:
nordsoft
2023-09-08 03:22:50 +02:00
parent ad8d7016b6 43ef20efc5
commit 0148662847
361 changed files with 4583 additions and 3595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapeditor/validator.cpp
+2 -2
View File
@@ -98,14 +98,14 @@ std::list<Validator::Issue> Validator::validate(const CMap * map)
if(o->getOwner() != PlayerColor::NEUTRAL && o->getOwner().getNum() < map->players.size())
{
if(!map->players[o->getOwner().getNum()].canAnyonePlay())
issues.emplace_back(QString(tr("Object %1 is assigned to non-playable player %2")).arg(o->instanceName.c_str(), o->getOwner().getStr().c_str()), true);
issues.emplace_back(QString(tr("Object %1 is assigned to non-playable player %2")).arg(o->instanceName.c_str(), o->getOwner().toString().c_str()), true);
}
//checking towns
if(auto * ins = dynamic_cast<CGTownInstance*>(o.get()))
{
bool has = amountOfCastles.count(ins->getOwner().getNum());
if(!has && ins->getOwner() != PlayerColor::NEUTRAL)
issues.emplace_back(tr("Town %1 has undefined owner %2").arg(ins->instanceName.c_str(), ins->getOwner().getStr().c_str()), true);
issues.emplace_back(tr("Town %1 has undefined owner %2").arg(ins->instanceName.c_str(), ins->getOwner().toString().c_str()), true);
if(has)
++amountOfCastles[ins->getOwner().getNum()];
}