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

allow using the builder itself in distance building restrictions

Browse source
This commit is contained in:
Tim Felgentreff 2015-08-31 11:01:36 +02:00
parent b8a8a453d9
commit d78078888a
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/include/unittype.h
View file

@ -413,7 +413,7 @@ public:
class CBuildRestrictionDistance : public CBuildRestriction
{
public:
CBuildRestrictionDistance() : Distance(0), RestrictType(NULL) {};
CBuildRestrictionDistance() : Distance(0), CheckBuilder(false), RestrictType(NULL) {};
virtual ~CBuildRestrictionDistance() {};
virtual void Init() {this->RestrictType = UnitTypeByIdent(this->RestrictTypeName);};
virtual bool Check(const CUnit *builder, const CUnitType &type, const Vec2i &pos, CUnit *&ontoptarget) const;
@ -423,6 +423,7 @@ public:
std::string RestrictTypeName;
std::string RestrictTypeOwner;
CUnitType *RestrictType;
bool CheckBuilder;
};
class CBuildRestrictionHasUnit : public CBuildRestriction

3
src/unit/build.cpp
View file

@ -135,7 +135,8 @@ bool CBuildRestrictionDistance::Check(const CUnit *builder, const CUnitType &typ
Select(pos1, pos2, table);
for (size_t i = 0; i != table.size(); ++i) {
if (builder != table[i] &&
bool isorctownhall = table[i]->Type->Ident.compare("unit-orc-town-hall");
if ((builder != table[i] || this->CheckBuilder) &&
// unit has RestrictType or no RestrictType was set, but a RestrictTypeOwner
(this->RestrictType == table[i]->Type || (!this->RestrictType && this->RestrictTypeOwner.size() > 0)) &&
// RestrictTypeOwner is not set or unit belongs to a suitable player

2
src/unit/script_unittype.cpp
View file

@ -266,6 +266,8 @@ static void ParseBuildingRules(lua_State *l, std::vector<CBuildRestriction *> &b
b->RestrictTypeName = LuaToString(l, -1);
} else if (!strcmp(value, "Owner")) {
b->RestrictTypeOwner = LuaToString(l, -1);
} else if (!strcmp(value, "CheckBuilder")) {
b->CheckBuilder = LuaToBoolean(l, -1);
} else {
LuaError(l, "Unsupported BuildingRules distance tag: %s" _C_ value);
}