Update copyright notice

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

diff --git a/src/lib/commands/tele.c b/src/lib/commands/tele.c
index fea31012d629b1a6cd5a01c57efa01a3ec63c6da..209a667511cb6f4fd500811577d33f022ace5f85 100644 (file)
--- a/src/lib/commands/tele.c
+++ b/src/lib/commands/tele.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,21 +25,17 @@
  *  ---
  *
  *  tele.c: Send a telegram
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "tel.h"
-#include "news.h"
-#include "file.h"
 #include "commands.h"
+#include "news.h"
 #include "optlist.h"
+#include "tel.h"
 
 int
 tele(void)
@@ -50,11 +45,10 @@ tele(void)
     char buf[MAXTELSIZE + 1];  /* UTF-8 */
     int n;
 
-    natp = getnatp(player->cnum);
     if (*player->argp[0] == 'a') {
        if (getele("everybody", buf) <= 0) {
            pr("Announcement aborted\n");
-           return RET_OK;
+           return RET_FAIL;
        }
        pr("\n");
        to = 0;
@@ -63,7 +57,7 @@ tele(void)
     } else if (*player->argp[0] == 'p') {
        if (getele("your Gracious Deity", buf) <= 0) {
            pr("Prayer aborted\n");
-           return RET_OK;
+           return RET_FAIL;
        }
        pr("\n");
        if (typed_wu(player->cnum, 0, buf, TEL_NORM) < 0)
@@ -81,12 +75,12 @@ tele(void)
                if (player->argp[2]) {
                    if (getele("multiple recipients", buf) < 0) {
                        pr("Telegram aborted\n");
-                       return RET_OK;
+                       return RET_FAIL;
                    }
                } else {
                    if (getele(cname(to), buf) < 0) {
                        pr("Telegram aborted\n");
-                       return RET_OK;
+                       return RET_FAIL;
                    }
                }
                pr("\n");
@@ -98,8 +92,7 @@ tele(void)
                kk++;
                continue;
            }
-           if (!player->god
-               && (getrejects(player->cnum, natp) & REJ_TELE)) {
+           if (!nat_accepts(to, player->cnum, REJ_TELE)) {
                pr("%s is rejecting your telegrams.\n", cname(to));
                return RET_SYN;
            }