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

(map, draw_map): Remove undocumented feature that lets deities run map

Browse source 
as another country.  It appeared around Chainsaw 3.0 and never fully
worked.  See also #1335316.
This commit is contained in:
Markus Armbruster 2005-10-23 08:32:49 +00:00
parent 01c80490b9
commit f5a1430bcf
5 changed files with 22 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/commands/map.c
View file

@ -57,7 +57,6 @@ map(void)
int as_country;
int map_flags = 0;
int i;
int where = 2;
s_char what[64];
s_char buf[1024];
@ -103,7 +102,6 @@ map(void)
}
b = player->argp[2];
while (b != (s_char *)0 && (*b)) {
where = 3;
switch (*b) {
case 's':
case 'S':
@ -124,18 +122,6 @@ map(void)
case '*':
map_flags |= MAP_ALL;
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
where = 2;
break;
case 't':
if (bmap != EF_BMAP)
goto bad_flag;
@ -156,15 +142,5 @@ map(void)
b++;
}
as_country = player->cnum;
if (player->god) {
if (player->argp[where] != (s_char *)0) {
as_country = atoi(player->argp[where]);
if ((as_country < 0) || (as_country > MAXNOC)) {
as_country = player->cnum;
}
}
}
return draw_map(bmap, origin, map_flags, &ns, as_country);
return draw_map(bmap, origin, map_flags, &ns);
}

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

@ -118,11 +118,11 @@ march(void)
++cp;
if (cp[-1] == 'M') {
unit_map(EF_LAND, lnd->lnd_uid, &ns, &origin);
draw_map(0, origin, 0, &ns, player->cnum);
draw_map(0, origin, 0, &ns);
skip = 1;
} else if (cp[-1] == 'B') {
unit_map(EF_LAND, lnd->lnd_uid, &ns, &origin);
draw_map(EF_BMAP, origin, 0, &ns, player->cnum);
draw_map(EF_BMAP, origin, 0, &ns);
skip = 1;
} else if (cp[-1] == 'f') {
struct emp_qelem *qp;

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

@ -140,11 +140,11 @@ navi(void)
++cp;
if (cp[-1] == 'M') {
unit_map(EF_SHIP, shp->shp_uid, &ns, &origin);
draw_map(0, origin, MAP_SHIP, &ns, player->cnum);
draw_map(0, origin, MAP_SHIP, &ns);
skip = 1;
} else if (cp[-1] == 'B') {
unit_map(EF_SHIP, shp->shp_uid, &ns, &origin);
draw_map(EF_BMAP, origin, MAP_SHIP, &ns, player->cnum);
draw_map(EF_BMAP, origin, MAP_SHIP, &ns);
skip = 1;
} else if (cp[-1] == 'f') {
struct emp_qelem *qp;