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

navigate: Require all ships to start in the same sector

Browse source 
The capability to navigate ships spread over several sectors is
obscure and rarely useful.  Accidental use is probably more frequent
than intentional use.  Issues:

* Interactive prompts show only the flagship's position, and give no
  clue that some ships are actually elsewhere.

* Path finding is supported only when all navigating ships are in
  the same sector.

* Interdiction becomes rather complex.  For each movement, every
  sector entered is interdicted independently.  This means the same
  fort, ship, land unit or plane can interdict multiple times.
  Interdiction order depends on the order the code examines
  ships. which the player can control.  This is all pretty much
  undocumented.

* Complicates the code and its maintenance.  Multiplies the number of
  test cases needed to cover navigate.

I feel we're better off without this feature.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-12-28 22:27:37 +01:00
parent 69c99a0f29
commit a024dbb8a3
9 changed files with 44 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/navi.c
View file

@ -50,17 +50,16 @@ navi(void)
struct nstr_item ni_ship;
struct emp_qelem ship_list;
double minmob, maxmob;
int together;
int together = 1;
if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
shp_sel(&ni_ship, &ship_list);
shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
shp_nav(&ship_list, &minmob, &maxmob, player->cnum);
if (QEMPTY(&ship_list)) {
pr("No ships\n");
return RET_FAIL;
}
return do_unit_move(&ship_list, &together, &minmob, &maxmob);
}
@ -99,7 +98,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
if (cp == NULL || *cp == '\0' || stopping) {
stopping = 0;
if (type == EF_SHIP)
shp_nav(ulist, minmob, maxmob, together, player->cnum);
shp_nav(ulist, minmob, maxmob, player->cnum);
else
lnd_mar(ulist, minmob, maxmob, player->cnum);
if (QEMPTY(ulist)) {
@ -126,7 +125,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
* at the prompt, we call shp_nav() or lnd_mar() again.
*/
if (type == EF_SHIP)
shp_nav(ulist, minmob, maxmob, together, player->cnum);
shp_nav(ulist, minmob, maxmob, player->cnum);
else
lnd_mar(ulist, minmob, maxmob, player->cnum);
if (QEMPTY(ulist)) {
@ -152,8 +151,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
dir = chkdir(*cp, DIR_STOP, DIR_LAST);
if (dir >= 0) {
if (type == EF_SHIP)
stopping |= shp_nav_one_sector(ulist, dir,
player->cnum, *together);
stopping |= shp_nav_one_sector(ulist, dir, player->cnum);
else {
if (!moved && !lnd_abandon_askyn(ulist))
return RET_FAIL;