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 92b192a64e62ca12c92e050953cee24d39a297a7..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-2007, 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,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,7 +25,7 @@
  *  ---
  *
  *  play.c: Who is logged on?
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
@@ -47,7 +46,7 @@ play(void)
     int saw = 0;
 
     play_header();
-    for (joe = player_prev(0); joe; joe = player_prev(joe)) {
+    for (joe = player_prev(NULL); joe; joe = player_prev(joe)) {
        saw += play_list(joe);
     }
     if (player->god || opt_BLITZ)
@@ -90,7 +89,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;
        }
@@ -101,8 +100,8 @@ play_list(struct player *joe)
        cname(joe->cnum),
        joe->cnum,
        player->god || joe->cnum == player->cnum ? praddr(joe) : "",
-       natp->nat_minused / 60,
-       natp->nat_minused % 60,
+       natp->nat_timeused / 3600,
+       (natp->nat_timeused % 3600) / 60,
        (long)(now - joe->curup));
 
     if (player->god) {