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

17
src/lib/subs/attsub.c
View file

@ -133,16 +133,10 @@ pr_com(int inon, struct combat *com, natid who)
inon ? inon == 1 ? "in " : "into " : "",
xyas(com->x, com->y, who));
} else if (com->type == EF_SHIP) {
if (opt_SHIPNAMES) {
return prbuf("%s%s %s(#%d)",
inon ? inon == 1 ? "on " : "onto " : "",
com->shp_mcp->m_name, com->shp_name,
com->shp_uid);
} else {
return prbuf("%s%s #%d",
inon ? inon == 1 ? "on " : "onto " : "",
com->shp_mcp->m_name, com->shp_uid);
}
return prbuf("%s%s %s(#%d)",
inon ? inon == 1 ? "on " : "onto " : "",
com->shp_mcp->m_name, com->shp_name,
com->shp_uid);
} else if (com->type == EF_LAND) {
return prbuf("%s%s #%d",
inon ? inon == 1 ? "on " : "onto " : "",
@ -266,8 +260,7 @@ att_get_combat(struct combat *com, int isdef)
return att_combat_init(com, EF_BAD);
}
com->shp_mcp = &mchr[(int)ship.shp_type];
if (opt_SHIPNAMES)
strncpy(com->shp_name, ship.shp_name, MAXSHPNAMLEN);
strncpy(com->shp_name, ship.shp_name, MAXSHPNAMLEN);
if (!isdef && !player->owner) {
if (com->set)
pr("%s was just sunk!\n", prcom(0, com));