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

(march, navi): Provide equivalent functionality to map in move(), expl()

Browse source 
and tran(). Allow map and bmap to access the regular map command
parameters.
This commit is contained in:
Ron Koenderink 2006-07-20 13:33:11 +00:00
parent 379cb0a840
commit 8e7199c338
4 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
info/march.t
View file

@ -54,14 +54,14 @@ The lookout command works in the same way as radar.
.s1 .s1
The \*Qmap\*U command will give you a The \*Qmap\*U command will give you a
map surrounding the current position. map surrounding the current position.
By default, it will be around the leader, but you may also By default, it will be around the leader.
specify a unit number. You can also supply additional parameters:
.EX <32.3: g 6,2> m 3 .EX <32.3: g 6,2> M 3 ls
.s1 .s1
is equivalent to a \*Qlmap\*U command. like is equivalent to a \*Qlmap\*U command. like
this: this:
.EX lmap 3 ls .EX lmap 3 ls
The \*Qmap\*U command works in the same way, The \*Qbmap\*U command works in the same way,
you get a bmap instead. you get a bmap instead.
.s1 .s1
The \*Qleader\*U command will the change the leader. The \*Qleader\*U command will the change the leader.

8
info/navigate.t
View file

@ -55,14 +55,14 @@ The \*Qlookout\*U and \*Qsonar\*U commands work in the same way as radar.
.s1 .s1
The \*Qmap\*U command will give you a The \*Qmap\*U command will give you a
map surrounding the current position. map surrounding the current position.
By default, it will be around the flagship, but you may also By default, it will be around the flagship.
specify a ship number. You can also supply additional parameters:
.EX <32.3: g 6,2> m 3 .EX <32.3: g 6,2>M 3 ls
.s1 .s1
is equivalent to a \*Qmap\*U command. like is equivalent to a \*Qmap\*U command. like
this: this:
.EX map 3 ls .EX map 3 ls
The \*Qmap\*U command works in the same way, The \*Qbmap\*U command works in the same way,
you get a bmap instead. you get a bmap instead.
.s1 .s1
The \*Qflagship\*U command will the change the flagship. The \*Qflagship\*U command will the change the flagship.

5
src/lib/commands/marc.c
View file

@ -53,8 +53,6 @@ march(void)
int together; int together;
char *cp = NULL; char *cp = NULL;
struct lndstr *lnd = NULL; /* leader */ struct lndstr *lnd = NULL; /* leader */
struct nstr_sect ns;
char origin;
int dir; int dir;
int stopping = 0; int stopping = 0;
int skip = 0; int skip = 0;
@ -139,8 +137,7 @@ march(void)
* fall through * fall through
*/ */
case 'M': case 'M':
unit_map(EF_LAND, atoi(player->argp[1]), &ns, &origin); do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]);
draw_map(bmap_flag, origin, 0, &ns);
skip = 1; skip = 1;
break; break;
case 'f': case 'f':

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

@ -52,8 +52,6 @@ navi(void)
int together; int together;
char *cp = NULL; char *cp = NULL;
struct shpstr *shp = NULL; /* flagship */ struct shpstr *shp = NULL; /* flagship */
struct nstr_sect ns;
char origin;
int dir; int dir;
int stopping = 0; int stopping = 0;
int skip = 0; int skip = 0;
@ -164,8 +162,7 @@ navi(void)
* fall through * fall through
*/ */
case 'M': case 'M':
unit_map(EF_SHIP, atoi(player->argp[1]), &ns, &origin); do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]);
draw_map(bmap_flag, origin, MAP_SHIP, &ns);
skip = 1; skip = 1;
break; break;
case 'f': case 'f':