Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ignore building rules when not in game (i.e. editor)

Browse source
This commit is contained in:
Tim Felgentreff 2022-03-19 10:10:36 +01:00
parent ffc888ec8d
commit 5f490b8dea
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/unit/build.cpp
View file

@ -453,22 +453,24 @@ CUnit *CanBuildHere(const CUnit *unit, const CUnitType &type, const Vec2i &pos)
}
}
size_t count = type.BuildingRules.size();
if (count > 0) {
for (unsigned int i = 0; i < count; ++i) {
CBuildRestriction *rule = type.BuildingRules[i];
CUnit *ontoptarget = NULL;
// All checks processed, did we really have success
if (rule->Check(unit, type, pos, ontoptarget)) {
// We passed a full ruleset return
if (unit == NULL) {
return ontoptarget ? ontoptarget : (CUnit *)1;
} else {
return ontoptarget ? ontoptarget : const_cast<CUnit *>(unit);
if (GameCycle != 0) {
size_t count = type.BuildingRules.size();
if (count > 0) {
for (unsigned int i = 0; i < count; ++i) {
CBuildRestriction *rule = type.BuildingRules[i];
CUnit *ontoptarget = NULL;
// All checks processed, did we really have success
if (rule->Check(unit, type, pos, ontoptarget)) {
// We passed a full ruleset return
if (unit == NULL) {
return ontoptarget ? ontoptarget : (CUnit *)1;
} else {
return ontoptarget ? ontoptarget : const_cast<CUnit *>(unit);
}
}
}
return NULL;
}
return NULL;
}
return (unit == NULL) ? (CUnit *)1 : const_cast<CUnit *>(unit);