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

(tran_map, tran_nmap, tran_pmap): Split tran_map() into tran_nmap()

Browse source 
and tran_pmap() so that unit number arguments are interpreted
sensibly.  Users changed.

(display_region_map): New.
(cmd_move_map, tran_nmap, tran_pmap): Use it.
This commit is contained in:
Ron Koenderink 2006-07-09 18:24:31 +00:00
parent f65b255d18
commit df8dc6ab5a
4 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/prototypes.h
View file

@ -308,6 +308,7 @@ extern void logerror(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
/* maps.c */
extern int draw_map(int, char, int, struct nstr_sect *);
extern int unit_map(int, int, struct nstr_sect *, char *);
extern int display_region_map(char *cmd, coord curx, coord cury, char *arg);
extern int bmaps_intersect(natid, natid);
extern int share_bmap(natid, natid, struct nstr_sect *, char, char *);
/* move.c */

6
src/lib/commands/move.c
View file

@ -350,11 +350,7 @@ move(void)
static int
cmd_move_map(coord curx, coord cury, char *arg)
{
player->argp[0] = "map";
player->argp[1] = arg;
player->argp[2] = NULL;
player->condarg = NULL;
return map();
return display_region_map("map", curx, cury, arg);
}
int

22
src/lib/commands/tran.c
View file

@ -48,7 +48,8 @@
#include "land.h"
#include "commands.h"
static int tran_map(coord curx, coord cury, char *arg);
static int tran_pmap(coord curx, coord cury, char *arg);
static int tran_nmap(coord curx, coord cury, char *arg);
static int tran_nuke(void);
static int tran_plane(void);
@ -120,7 +121,7 @@ tran_nuke(void)
}
dam = 0;
mcost = move_ground(&sect, &endsect, weight,
player->argp[3], tran_map, 0, &dam);
player->argp[3], tran_nmap, 0, &dam);
if (mcost < 0)
return 0;
@ -214,7 +215,7 @@ tran_plane(void)
}
dam = 1;
mcost = move_ground(&sect, &endsect, weight,
player->argp[3], tran_map, 0, &dam);
player->argp[3], tran_pmap, 0, &dam);
dam /= count;
if (mcost < 0)
return 0;
@ -251,11 +252,14 @@ tran_plane(void)
*/
/*ARGSUSED*/
static int
tran_map(coord curx, coord cury, char *arg)
tran_pmap(coord curx, coord cury, char *arg)
{
player->argp[0] = "map";
player->argp[1] = arg;
player->argp[2] = NULL;
player->condarg = NULL;
return map();
return display_region_map("pmap", curx, cury, arg);
}
static int
tran_nmap(coord curx, coord cury, char *arg)
{
return display_region_map("nmap", curx, cury, arg);
}

29
src/lib/common/maps.c
View file

@ -356,6 +356,35 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp)
return RET_OK;
}
int
display_region_map(char *cmd, coord curx, coord cury, char *arg)
{
char coordinates[80], *cp;
player->argp[0] = cmd;
if (!arg || !*arg) {
struct natstr *np;
np = getnatp(player->cnum);
sprintf(coordinates, "%d:%d,%d:%d",
xrel(np, curx - 10), xrel(np, curx + 11),
yrel(np, cury - 5), yrel(np, cury + 6));
player->argp[1] = coordinates;
player->argp[2] = NULL;
} else {
player->argp[1] = arg;
cp = strchr(arg, ' ');
if (cp != NULL) {
*cp++ = '\0';
while (isspace(*cp)) cp++;
player->argp[2] = cp;
} else
player->argp[2] = NULL;
}
player->condarg = NULL;
return map();
}
int
bmaps_intersect(natid a, natid b)
{