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

(radar): New, moved functionality from rada() except ef_type determination.

Browse source 
(rada): Call radar() with EF_SHIP.
(lrad): New, call radar() with EF_LAND.
(empmod[]): Call lrad() for lradar command.
(march, navi): Call radar() with appropriate type.
This commit is contained in:
Ron Koenderink 2006-08-16 01:16:30 +00:00
parent ed88f3140d
commit a9a9957a27
5 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -73,6 +73,7 @@ extern char *prsub(struct shpstr *);
extern int check_trade(void); extern int check_trade(void);
extern int ontradingblock(int, void *); extern int ontradingblock(int, void *);
extern void trdswitchown(int, void *, int); extern void trdswitchown(int, void *, int);
extern int radar(short);
/* Commands */ /* Commands */
int acce(void); int acce(void);
int add(void); int add(void);
@ -145,6 +146,7 @@ int llook(void);
int load(void); int load(void);
int look(void); int look(void);
int lost(void); int lost(void);
int lrad(void);
int lrange(void); int lrange(void);
int lretr(void); int lretr(void);
int lsta(void); int lsta(void);

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

@ -156,7 +156,7 @@ march(void)
break; break;
case 'r': case 'r':
player->argp[0] = "lradar"; player->argp[0] = "lradar";
rada(); radar(EF_LAND);
skip = 1; skip = 1;
player->btused++; player->btused++;
break; break;

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

@ -179,7 +179,7 @@ navi(void)
stopping |= shp_sweep(&ship_list, 1, 0, player->cnum); stopping |= shp_sweep(&ship_list, 1, 0, player->cnum);
break; break;
case 'r': case 'r':
rada(); radar(EF_SHIP);
skip = 1; skip = 1;
player->btused++; player->btused++;
break; break;

15
src/lib/commands/rada.c
View file

@ -38,8 +38,18 @@
#include "optlist.h" #include "optlist.h"
#include "empobj.h" #include "empobj.h"
int rada(void)
{
return radar(EF_SHIP);
}
int lrad(void)
{
return radar(EF_LAND);
}
int int
rada(void) radar(short type)
{ {
char *cp; char *cp;
double tf; double tf;
@ -48,11 +58,8 @@ rada(void)
struct nstr_sect ns; struct nstr_sect ns;
union empobj_storage item; union empobj_storage item;
char buf[1024]; char buf[1024];
short type;
char prompt[80]; char prompt[80];
type = player->argp[0][0] == 'l' ? EF_LAND : EF_SHIP;
sprintf(prompt, "Radar from (%s # or sector(s)) : ", ef_nameof(type)); sprintf(prompt, "Radar from (%s # or sector(s)) : ", ef_nameof(type));
cp = getstarg(player->argp[1], prompt, buf); cp = getstarg(player->argp[1], prompt, buf);

2
src/lib/player/empmod.c
View file

@ -142,7 +142,7 @@ struct cmndstr player_coms[] = {
1, load, C_MOD, NORM + CAP}, 1, load, C_MOD, NORM + CAP},
{"lookout <SHIPS>", 1, look, 0, NORM + CAP}, {"lookout <SHIPS>", 1, look, 0, NORM + CAP},
{"lost", 0, lost, 0, NORM}, {"lost", 0, lost, 0, NORM},
{"lradar <UNITS | SECTS>", 1, rada, 0, NORM + CAP}, {"lradar <UNITS | SECTS>", 1, lrad, 0, NORM + CAP},
{"lrange <UNITS> <range>", 1, lrange, C_MOD, NORM + CAP}, {"lrange <UNITS> <range>", 1, lrange, C_MOD, NORM + CAP},
{"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]", {"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]",
1, lretr, C_MOD, NORM + CAP}, 1, lretr, C_MOD, NORM + CAP},