fixed Fieldquotient Prairie

This commit is contained in:
Zeno Rogue 2017-11-03 22:19:45 +01:00
parent 7792c27d09
commit 8754d7d3be
2 changed files with 9 additions and 4 deletions

View File

@ -2706,10 +2706,8 @@ namespace prairie {
c->LHU.fi.rval = max(celldist(c), 15);
}
else {
if(!from) {
for(int i=0; i<size(currfp.matrices); i++)
if(currfp.distflower[i] == 0)
c->fval = currfp.inverses[i]+1;
if(quotient == 2 || !from) {
c->fval = currfp.distflower0;
}
else if(from && from->land == laPrairie && from->fval)
c->fval = from->fval;

View File

@ -342,6 +342,7 @@ struct fpattern {
vector<char> disthex;
vector<char> distwall, distriver, distwall2, distriverleft, distriverright, distflower;
int distflower0;
vector<eItem> markers;
@ -536,6 +537,12 @@ struct fpattern {
int riverdist = dijkstra(nontruncated ? distflower : distriver, indist);
DEBB(DF_FIELD, (debugfile, "river dist = %d\n", riverdist));
for(int i=0; i<size(currfp.matrices); i++)
if(currfp.distflower[i] == 0) {
distflower0 = currfp.inverses[i]+1;
break;
}
if(!nontruncated) {
W = matrices[riverid];
for(int i=0; i<wallorder; i++) {