commands: Rename the command functions

[empserver] / src / lib / commands / reje.c

diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c
index eafb9c2f651a2fba10a687ff02e9a4368b5db8fa..2cc08160ece1ef27aa3ec468997c5f2df3337f29 100644 (file)
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -24,22 +24,22 @@
  *
  *  ---
  *
- *  reje.c: Refuse telegrams/annos/treaties/loans from countries
+ *  reje.c: Refuse telegrams/annos/loans from countries
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 int
-reje(void)
+c_reject(void)
 {
+    static char *what[] = { "teles", "annos", "loans" };
     char *p;
-    int rel;
+    enum rej_comm rej;
     int do_undo;
     struct natstr nat;
     struct nstr_item ni;
@@ -59,21 +59,18 @@ reje(void)
        return RET_SYN;
     }
     p = getstarg(player->argp[2],
-                "mail, treaties, loans, or announcements? ", buf);
+                "mail, loans, or announcements? ", buf);
     if (!p)
        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;
-       break;
-    case 't':
-       rel = REJ_TREA;
+       rej = REJ_TELE;
        break;
     default:
        pr("That's not one of the choices!\n");
@@ -90,25 +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;
-       case REJ_TREA:
-           pr("%s treaties 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;
 }