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

prnat() prnatid(): New, common country name (#number) formatting

Browse source 
prnat() is more convenient when you already got the struct natstr *.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-14 23:15:03 +01:00
parent 383bbff603
commit 61a32b8b69
10 changed files with 65 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/spy.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1998-2000
* Markus Armbruster, 2005-2011
* Markus Armbruster, 2005-2013
*/
#include <config.h>
@ -138,18 +138,16 @@ spy(void)
pr("Spy deported from %s\n",
xyas(nx, ny, player->cnum));
if (own != 0)
wu(0, own, "%s (#%d) spy deported from %s\n",
cname(player->cnum), player->cnum,
xyas(nx, ny, own));
wu(0, own, "%s spy deported from %s\n",
prnat(natp), xyas(nx, ny, own));
} else {
/* execute spy */
pr("BANG!! A spy was shot in %s\n",
xyas(nx, ny, player->cnum));
military--;
if (own != 0)
wu(0, own, "%s (#%d) spy caught in %s\n",
cname(player->cnum), player->cnum,
xyas(nx, ny, own));
wu(0, own, "%s spy caught in %s\n",
prnat(natp), xyas(nx, ny, own));
nreport(player->cnum, N_SPY_SHOT, own, 1);
}
if (opt_HIDDEN)