Update copyright notice

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

diff --git a/src/lib/commands/play.c b/src/lib/commands/play.c
index e8a64fa249db6785c11209528e3fa6aefb9b4866..a6335c484ca63cc7121b8fe605a840a586a421c1 100644 (file)
--- a/src/lib/commands/play.c
+++ b/src/lib/commands/play.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, 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/>.
  *
  *  ---
  *
@@ -30,6 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2005-2011
  */
 
 #include <config.h>
@@ -90,7 +90,7 @@ play_list(struct player *joe)
        /* This isn't us.  Can we see it? */
        if (natp->nat_stat == STAT_VIS) {
            /* Yes, we can see visitors are logged on */
-       } else if (getrel(natp, player->cnum) < ALLIED) {
+       } else if (relations_with(joe->cnum, player->cnum) < ALLIED) {
            /* This is a non-allied country, don't show it. */
            return 0;
        }
@@ -106,17 +106,13 @@ play_list(struct player *joe)
        (long)(now - joe->curup));
 
     if (player->god) {
-       if (!joe->combuf || !*joe->combuf)
-           pr(" NULL\n");
-       else {
-           n = ufindpfx(joe->combuf, 20);
-           if (CANT_HAPPEN(n + 3u > sizeof(com))) {
-               pr(" BUGGY\n");
-               return 1;
-           }
-           sprintf(com, " %.*s\n", n, joe->combuf);
-           uprnf(com);
+       n = ufindpfx(joe->combuf, 20);
+       if (CANT_HAPPEN(n + 3u > sizeof(com))) {
+           pr(" BUGGY\n");
+           return 1;
        }
+       sprintf(com, " %.*s\n", n, joe->combuf);
+       uprnf(com);
     } else
        pr("\n");