Fix für E2

Die Abfrage der Option war ohne Default, so das sie hier immer an war.
In E2 führ das dann wegen cmp_taxes zur assertion.

Das wars, jetzt sollte alles rund sein.
This commit is contained in:
CTD 2014-08-08 17:27:13 +02:00
parent fe0ff71aa1
commit 53a5314463
1 changed files with 19 additions and 20 deletions

View File

@ -1017,8 +1017,7 @@ static bool maintain(building * b, bool first)
bool paid = true, work = first;
unit *u;
if (fval(b, BLD_MAINTAINED) || b->type == NULL || b->type->maintenance == NULL
|| is_cursed(b->attribs, C_NOCOST, 0)) {
if (fval(b, BLD_MAINTAINED) || b->type == NULL || b->type->maintenance == NULL || is_cursed(b->attribs, C_NOCOST, 0)) {
fset(b, BLD_MAINTAINED);
fset(b, BLD_WORKING);
return true;
@ -1030,7 +1029,7 @@ static bool maintain(building * b, bool first)
if (u == NULL)
return false;
/* If the owner is the region owner, check if biggest castle has the dontpay flag */
if (get_param(global.parameters, "rules.region_owner_pay_building")) {
if (check_param(global.parameters, "rules.region_owner_pay_building", b->type->_name)) {
if (u == building_owner(largestbuilding(r, &cmp_taxes, false))) {
if (fval(u->building, BLD_DONTPAY)) {
return false;