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

(SHIPNAMES, opt_SHIPNAMES, Options, carg, name, sorde, qorde)

Browse source 
(show_sail, shi, att_get_combat, pr_com, satdisp, satmap, prship):
Remove nooption SHIPNAMES.
This commit is contained in:
Markus Armbruster 2005-07-31 17:22:32 +00:00
parent df8845199e
commit 786b34c693
12 changed files with 27 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/carg.c
View file

@ -77,11 +77,8 @@ carg(void)
pr("%4d", ship.shp_item[I_LCM]);
pr("%4d", ship.shp_item[I_HCM]);
pr("%4d\n", ship.shp_item[I_RAD]);
if (opt_SHIPNAMES) {
if (ship.shp_name[0] != 0) {
pr(" %s\n", ship.shp_name);
}
}
if (ship.shp_name[0] != 0)
pr(" %s\n", ship.shp_name);
}
if (nships == 0) {
if (player->argp[1])

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

@ -51,10 +51,6 @@ name(void)
struct nstr_item nb;
s_char buf[1024];
if (!opt_SHIPNAMES) {
pr("Ship naming is not enabled.\n");
return RET_FAIL;
}
if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
return RET_SYN;
while (nxtitem(&nb, &ship)) {

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

@ -403,7 +403,7 @@ qorde(void)
} else
pr(" has a sail path\n");
if (opt_SHIPNAMES && ship.shp_name[0] != 0) {
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
@ -494,7 +494,7 @@ sorde(void)
} else
pr(" has a sail path\n");
if (opt_SHIPNAMES && ship.shp_name[0] != 0) {
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);

10
src/lib/commands/sail.c
View file

@ -75,12 +75,10 @@ show_sail(struct nstr_item *nstr)
pr("Has orders");
}
pr("\n");
if (opt_SHIPNAMES) {
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
}
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
}
}
if (count == 0) {

10
src/lib/commands/shi.c
View file

@ -94,12 +94,10 @@ shi(void)
if (opt_FUEL)
pr("%5d", ship.shp_fuel);
pr("%5d\n", ship.shp_tech);
if (opt_SHIPNAMES) {
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
}
if (ship.shp_name[0] != 0) {
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
}
}
if (nships == 0) {