Indented with src/scripts/indent-emp.

This commit is contained in:
Markus Armbruster 2003-09-02 20:48:48 +00:00
parent 5f263a7753
commit 9b7adfbecc
437 changed files with 52211 additions and 51052 deletions

View file

@ -50,87 +50,84 @@
int
dist(void)
{
struct sctstr sect, dsect, tsect;
struct nstr_sect nstr;
s_char *path, *p;
double move_cost=0.0;
coord dstx, dsty;
s_char buf[1024];
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
while (!player->aborted && nxtsct(&nstr, &sect)) {
if (!player->owner)
continue;
pr("%s at %s ", dchr[sect.sct_type].d_name,
xyas(nstr.x, nstr.y, player->cnum));
if ((sect.sct_dist_x != sect.sct_x) ||
(sect.sct_dist_y != sect.sct_y)) {
getsect(sect.sct_dist_x, sect.sct_dist_y, &tsect);
if (tsect.sct_own != player->cnum)
pr("distributes to %s, not owned by you.\n",
xyas(tsect.sct_x, tsect.sct_y, player->cnum));
else
pr("distributes to %s. \n",
xyas(tsect.sct_x, tsect.sct_y, player->cnum));
} else
pr("has no dist sector. \n");
p = getstarg(player->argp[2], "Distribution sector? ", buf);
if (p && (*p == 0))
continue;
if (!check_sect_ok(&sect))
continue;
struct sctstr sect, dsect, tsect;
struct nstr_sect nstr;
s_char *path, *p;
double move_cost = 0.0;
coord dstx, dsty;
s_char buf[1024];
if (p && (*p != '.') && (*p != 'h') &&
(!sarg_xy(p, &dstx, &dsty)))
return RET_SYN;
if (p && ((*p == '.') || (*p == 'h'))){
dstx = sect.sct_x;
dsty = sect.sct_y;
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
while (!player->aborted && nxtsct(&nstr, &sect)) {
if (!player->owner)
continue;
pr("%s at %s ", dchr[sect.sct_type].d_name,
xyas(nstr.x, nstr.y, player->cnum));
if ((sect.sct_dist_x != sect.sct_x) ||
(sect.sct_dist_y != sect.sct_y)) {
getsect(sect.sct_dist_x, sect.sct_dist_y, &tsect);
if (tsect.sct_own != player->cnum)
pr("distributes to %s, not owned by you.\n",
xyas(tsect.sct_x, tsect.sct_y, player->cnum));
else
pr("distributes to %s. \n",
xyas(tsect.sct_x, tsect.sct_y, player->cnum));
} else
pr("has no dist sector. \n");
p = getstarg(player->argp[2], "Distribution sector? ", buf);
if (p && (*p == 0))
continue;
if (!check_sect_ok(&sect))
continue;
if (p && (*p != '.') && (*p != 'h') && (!sarg_xy(p, &dstx, &dsty)))
return RET_SYN;
if (p && ((*p == '.') || (*p == 'h'))) {
dstx = sect.sct_x;
dsty = sect.sct_y;
}
if (!getsect(dstx, dsty, &dsect)) {
pr("Bad sector.\n");
return RET_FAIL;
}
if (dsect.sct_own != player->cnum)
pr("Warning: you don't own %s!\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum));
path = BestDistPath(buf, &sect, &dsect, &move_cost, MOB_ROAD);
if (path == (s_char *)0) {
pr("No owned path from %s to %s.\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum),
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
if ((dsect.sct_x == sect.sct_x) && (dsect.sct_y == sect.sct_y)) {
pr("Distribution from and to %s %s terminated\n",
dchr[sect.sct_type].d_name,
xyas(sect.sct_x, sect.sct_y, player->cnum));
} else {
pr("%s %s now distributes to %s (cost %1.3f)\n",
dchr[sect.sct_type].d_name,
xyas(sect.sct_x, sect.sct_y, player->cnum),
xyas(dsect.sct_x, dsect.sct_y, player->cnum), move_cost);
}
pr("\n");
/* Only change and write out if we are really changing where it
distributes to. Otherwise, it's a waste of time (since nothing
changed.) */
if ((sect.sct_dist_x != dsect.sct_x) ||
(sect.sct_dist_y != dsect.sct_y)) {
sect.sct_dist_x = dsect.sct_x;
sect.sct_dist_y = dsect.sct_y;
putsect(&sect);
}
}
if (!getsect(dstx,dsty,&dsect)){
pr("Bad sector.\n");
return RET_FAIL;
}
if (dsect.sct_own != player->cnum)
pr("Warning: you don't own %s!\n",
xyas(dsect.sct_x,dsect.sct_y,player->cnum));
path = BestDistPath(buf, &sect,&dsect,&move_cost,MOB_ROAD);
if (path == (s_char *)0){
pr("No owned path from %s to %s.\n",
xyas(dsect.sct_x,dsect.sct_y,player->cnum),
xyas(sect.sct_x,sect.sct_y,player->cnum));
continue;
}
if ((dsect.sct_x == sect.sct_x) &&
(dsect.sct_y == sect.sct_y)) {
pr("Distribution from and to %s %s terminated\n",
dchr[sect.sct_type].d_name,
xyas(sect.sct_x, sect.sct_y, player->cnum));
} else {
pr("%s %s now distributes to %s (cost %1.3f)\n",
dchr[sect.sct_type].d_name,
xyas(sect.sct_x, sect.sct_y, player->cnum),
xyas(dsect.sct_x, dsect.sct_y, player->cnum),
move_cost);
}
pr("\n");
/* Only change and write out if we are really changing where it
distributes to. Otherwise, it's a waste of time (since nothing
changed.) */
if ((sect.sct_dist_x != dsect.sct_x) ||
(sect.sct_dist_y != dsect.sct_y)) {
sect.sct_dist_x = dsect.sct_x;
sect.sct_dist_y = dsect.sct_y;
putsect(&sect);
}
}
return RET_OK;
return RET_OK;
}