/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* snxtsct.c: Arrange sector selection using either distance or area
- *
+ *
* Known contributors to this file:
* Dave Pare, 1989
+ * Markus Armbruster, 2006-2009
*/
#include <config.h>
int dist, n;
char buf[1024];
- if (str == 0 || *str == 0) {
- if ((str = getstring("(sects)? ", buf)) == 0)
+ if (!str || !*str) {
+ if (!(str = getstring("(sects)? ", buf)))
return 0;
}
switch (sarg_type(str)) {
natp = getnatp(player->cnum);
range.lx = xabs(natp, -WORLD_X / 2);
range.ly = yabs(natp, -WORLD_Y / 2);
- range.hx = xabs(natp, WORLD_X / 2);
- range.hy = yabs(natp, WORLD_Y / 2);
- range.width = range.height = 0;
+ range.hx = xnorm(range.lx + WORLD_X - 1);
+ range.hy = ynorm(range.ly + WORLD_Y - 1);
+ xysize_range(&range);
snxtsct_area(np, &range);
break;
default:
return 0;
}
- if (player->condarg == 0)
+ if (!player->condarg)
return 1;
n = nstr_comp(np->cond, sizeof(np->cond) / sizeof(*np->cond),
EF_SECTOR, player->condarg);
{
struct range worldrange;
- worldrange.lx = -WORLD_X / 2;
- worldrange.ly = -WORLD_Y / 2;
- worldrange.hx = WORLD_X / 2;
- worldrange.hy = WORLD_Y / 2;
- worldrange.width = worldrange.height = 0;
+ worldrange.lx = 0;
+ worldrange.ly = 0;
+ worldrange.hx = WORLD_X - 1;
+ worldrange.hy = WORLD_Y - 1;
+ xysize_range(&worldrange);
snxtsct_area(np, &worldrange);
}
np->range = *range;
np->ncond = 0;
np->type = NS_AREA;
- np->read = ef_read;
np->x = np->range.lx - 1;
np->y = np->range.ly;
np->dx = -1;
np->dy = 0;
- xysize_range(&np->range);
}
void
np->ncond = 0;
np->dist = dist;
np->type = NS_DIST;
- np->read = ef_read;
np->x = np->range.lx - 1;
np->y = np->range.ly;
np->dx = -1;
np->dy = 0;
-#if 0
- /* This function is now done elsewhere. */
- /* It was not doing the right thing when the world was small */
- xysize_range(&np->range);
-#endif
}
void
xysize_range(struct range *rp)
{
- if (rp->lx >= rp->hx)
- rp->width = WORLD_X + rp->hx - rp->lx;
+ if (rp->lx > rp->hx)
+ rp->width = WORLD_X + rp->hx + 1 - rp->lx;
else
- rp->width = rp->hx - rp->lx;
+ rp->width = rp->hx + 1 - rp->lx;
if (CANT_HAPPEN(rp->width > WORLD_X))
rp->width = WORLD_X;
- if (rp->ly >= rp->hy)
- rp->height = WORLD_Y + rp->hy - rp->ly;
+ if (rp->ly > rp->hy)
+ rp->height = WORLD_Y + rp->hy + 1 - rp->ly;
else
- rp->height = rp->hy - rp->ly;
+ rp->height = rp->hy + 1 - rp->ly;
if (CANT_HAPPEN(rp->height > WORLD_Y))
rp->height = WORLD_Y;
}
-/* This is called also called in snxtitem.c */
void
xydist_range(coord x, coord y, int dist, struct range *rp)
{
- if (dist < WORLD_X / 4) {
- rp->lx = xnorm((coord)(x - 2 * dist));
- rp->hx = xnorm((coord)(x + 2 * dist) + 1);
+ if (4 * dist + 1 < WORLD_X) {
+ rp->lx = xnorm(x - 2 * dist);
+ rp->hx = xnorm(x + 2 * dist);
rp->width = 4 * dist + 1;
} else {
- /* Range is larger than the world */
- /* Make sure we get lx in the right place. */
- rp->lx = xnorm((coord)(x - WORLD_X / 2));
- rp->hx = xnorm((coord)(rp->lx + WORLD_X - 1));
+ rp->lx = xnorm(x - WORLD_X / 2);
+ rp->hx = xnorm(rp->lx + WORLD_X - 1);
rp->width = WORLD_X;
}
- if (dist < WORLD_Y / 2) {
- rp->ly = ynorm((coord)(y - dist));
- rp->hy = ynorm((coord)(y + dist) + 1);
+ if (2 * dist + 1 < WORLD_Y) {
+ rp->ly = ynorm(y - dist);
+ rp->hy = ynorm(y + dist);
rp->height = 2 * dist + 1;
} else {
- /* Range is larger than the world */
- rp->ly = ynorm((coord)(y - WORLD_Y / 2));
- rp->hy = ynorm((coord)(rp->ly + WORLD_Y - 1));
+ rp->ly = ynorm(y - WORLD_Y / 2);
+ rp->hy = ynorm(rp->ly + WORLD_Y - 1);
rp->height = WORLD_Y;
}
}