empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(sector_mcost, bp_neighbors, lnd_mar_one_sector): Deal with disabled

Browse source 
road/rail infrastructure.
This commit is contained in:
Markus Armbruster 2006-06-16 21:11:25 +00:00
parent 9067d7a453
commit 07de857b88
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/common/move.c
View file

@ -57,12 +57,14 @@ sector_mcost(struct sctstr *sp, int mobtype)
if (mobtype == MOB_MOVE || mobtype == MOB_MARCH) { if (mobtype == MOB_MOVE || mobtype == MOB_MARCH) {
/* linear function in road, base at 0%, base/10 at 100% */ /* linear function in road, base at 0%, base/10 at 100% */
cost = base * (1.0 - 0.009 * sp->sct_road); cost = base;
if (intrchr[INT_ROAD].in_enable)
cost -= base * 0.009 * sp->sct_road;
} else if (mobtype == MOB_RAIL) { } else if (mobtype == MOB_RAIL) {
if (sp->sct_rail <= 0) if (!intrchr[INT_RAIL].in_enable || sp->sct_rail <= 0)
return -1.0; return -1.0;
/* linear function in rail, base at 0%, base/100 at 100% */ /* linear function in rail, base at 0%, base/100 at 100% */
cost = base * (1.0 - 0.0099 * sp->sct_rail); cost = base - base * 0.0099 * sp->sct_rail;
} else { } else {
CANT_REACH(); CANT_REACH();
cost = base; cost = base;

3
src/lib/common/path.c
View file

@ -221,7 +221,8 @@ bp_neighbors(struct as_coord c, struct as_coord *cp, void *pp)
move through it. We calculate it later. */ move through it. We calculate it later. */
if (dchr[sp->sct_type].d_mcst == 0) if (dchr[sp->sct_type].d_mcst == 0)
continue; continue;
if (bp->bp_mobtype == MOB_RAIL && sp->sct_rail == 0) if (bp->bp_mobtype == MOB_RAIL
&& (!intrchr[INT_RAIL].in_enable || sp->sct_rail == 0))
continue; continue;
if (sp->sct_own != from->sct_own) if (sp->sct_own != from->sct_own)
continue; continue;

2
src/lib/subs/lndsub.c
View file

@ -1072,7 +1072,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
continue; continue;
} }
} }
if (sect.sct_rail == 0 && if ((!intrchr[INT_RAIL].in_enable || sect.sct_rail == 0) &&
lchr[(int)llp->land.lnd_type].l_flags & L_TRAIN) { lchr[(int)llp->land.lnd_type].l_flags & L_TRAIN) {
if (together) { if (together) {
pr("no rail system in %s\n", xyas(newx, newy, actor)); pr("no rail system in %s\n", xyas(newx, newy, actor));