License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/play.c b/src/lib/commands/play.c
index 57f6e12dbd4c627c5ecbde164403db05440dd640..a0a79a29a9d621afcc8f74c16dc40fc65de27b33 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-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,28 +14,25 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  play.c: Who is logged on?
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
  */
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
+#include <config.h>
+
 #include "optlist.h"
 #include "commands.h"
 
@@ -47,15 +44,13 @@ play(void)
 {
     struct player *joe;
     int saw = 0;
-    int count = 0;
 
-    for (joe = player_prev(0); joe; joe = player_prev(joe)) {
-       if (!count++)
-           play_header();
+    play_header();
+    for (joe = player_prev(NULL); joe; joe = player_prev(joe)) {
        saw += play_list(joe);
     }
     if (player->god || opt_BLITZ)
-       pr("%d player%s\n", count, splur(count));
+       pr("%d player%s\n", saw, splur(saw));
 
     return RET_OK;
 }
@@ -72,9 +67,10 @@ static int
 play_list(struct player *joe)
 {
     time_t now;
-    s_char *com;
+    char com[1 + 6*20 + 2];    /* UTF-8 */
     struct natstr *natp;
     struct natstr *us;
+    int n;
 
     if (joe->cnum >= MAXNOC || !(natp = getnatp(joe->cnum)))
        return 0;
@@ -86,35 +82,42 @@ play_list(struct player *joe)
        /* It's a blitz, we see everything */
     } else if (joe->god) {
        /* This country is a god, so we see it */
-    } else if (us->nat_stat == VIS) {
+    } else if (us->nat_stat == STAT_VIS) {
        /* We are a visitor country, we can't see squat, except deities */
        return 0;
     } else if (joe->cnum != player->cnum) {
        /* This isn't us.  Can we see it? */
-       if (natp->nat_stat == VIS) {
+       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;
        }
     }
 
     time(&now);
+    pr("%-9.9s %3d %32.32s %2d:%02d %4lds",
+       cname(joe->cnum),
+       joe->cnum,
+       player->god || joe->cnum == player->cnum ? praddr(joe) : "",
+       natp->nat_timeused / 3600,
+       (natp->nat_timeused % 3600) / 60,
+       (long)(now - joe->curup));
+
     if (player->god) {
        if (!joe->combuf || !*joe->combuf)
-           com = "NULL";
-       else
-           com = 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);
+       }
     } else
-       com = "";
-
+       pr("\n");
 
-    pr("%-9.9s %3d %32.32s %2d:%02d %4lds %-20.20s\n",
-       cname(joe->cnum),
-       joe->cnum,
-       (player->god
-       || joe->cnum == player->cnum) ? praddr(joe) : (s_char *)"",
-       natp->nat_minused / 60, natp->nat_minused % 60, now - joe->curup,
-       com);
     return 1;
 }