Update copyright notice

[empserver] / src / server / idle.c

diff --git a/src/server/idle.c b/src/server/idle.c
index 9852f65e9e68958fe249298784cdbc1701291b69..5ca5c16d62cc009449c01bf0a42958c7c9586ba2 100644 (file)
--- a/src/server/idle.c
+++ b/src/server/idle.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,13 +31,13 @@
  *     Dave Pare, 1994
  */
 
-#include "misc.h"
-#include "player.h"
-#include "empio.h"
+#include <config.h>
+
+#include <time.h>
 #include "empthread.h"
-#include "proto.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
 #include "server.h"
 
 /*ARGSUSED*/
@@ -51,29 +51,19 @@ player_kill_idle(void *unused)
     while (1) {
        empth_sleep(now + 60);
        time(&now);
-       /*if (update_pending) */
-       /*continue; */
        for (p = player_next(0); p != 0; p = player_next(p)) {
            if (p->state == PS_SHUTDOWN) {
-               /* no more mr. nice guy */
-               p->state = PS_KILL;
-               p->aborted++;
-               empth_terminate(p->proc);
-               p = player_delete(p);
+               /*
+                * Player thread hung or just aborted by update or
+                * shutdown, we can't tell.
+                */
                continue;
            }
            if (p->curup + max_idle * 60 < now) {
                p->state = PS_SHUTDOWN;
-               /* giving control to another thread while
-                * in the middle of walking player list is
-                * not a good idea at all. Sasha */
                p->aborted++;
                pr_flash(p, "idle connection terminated\n");
                empth_wakeup(p->proc);
-               /* go to sleep because player thread
-                  could vandalize a player list */
-
-               break;
            }
        }
     }