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

reject: Simplify printing of new state

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 12:55:08 +01:00
parent 4628661b40
commit f9f3900595
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/commands/reje.c
View file

@ -27,7 +27,7 @@
* reje.c: Refuse telegrams/annos/loans from countries
*
* Known contributors to this file:
*
* Markus Armbruster, 2006-2016
*/
#include <config.h>
@ -37,8 +37,9 @@
int
reje(void)
{
static char *what[] = { "teles", "annos", "loans" };
char *p;
enum rej_comm rel;
enum rej_comm rej;
int do_undo;
struct natstr nat;
struct nstr_item ni;
@ -63,13 +64,13 @@ reje(void)
return RET_SYN;
switch (*p) {
case 'a':
rel = REJ_ANNO;
rej = REJ_ANNO;
break;
case 'l':
rel = REJ_LOAN;
rej = REJ_LOAN;
break;
case 'm':
rel = REJ_TELE;
rej = REJ_TELE;
break;
default:
pr("That's not one of the choices!\n");
@ -86,21 +87,10 @@ reje(void)
}
if (nat.nat_stat == STAT_UNUSED)
continue;
switch (rel) {
case REJ_ANNO:
pr("%s annos from %s\n",
(do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
break;
case REJ_LOAN:
pr("%s loans from %s\n",
(do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
break;
case REJ_TELE:
pr("%s teles from %s\n",
(do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
break;
}
setrej(player->cnum, (natid)ni.cur, do_undo, rel);
pr("%s %s from %s\n",
(do_undo == 1 ? "Rejecting" : "Accepting"),
what[rej], nat.nat_cnam);
setrej(player->cnum, (natid)ni.cur, do_undo, rej);
}
return RET_OK;
}