COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index ad51e11892b7d4df59e0465a8dd6d24a0ba3e7c9..5f76bc033875ca65942ad1a88ed612e8331322c9 100644 (file)
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.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-2006, 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,86 +31,77 @@
  *     Steve McClure, 1996
  */
 
+#include <config.h>
+
+#include <stdio.h>
+#include <time.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
 #include "nsc.h"
-#include "nat.h"
-#include "deity.h"
 #include "path.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "server.h"
 #include "prototypes.h"
 
-#include <stdio.h>
-
 int
 mobupdate(void)
 {
-       FILE    *fp;
-       long    minites;
-       extern  int updating_mob;
-       struct  mob_acc_globals timestamps;
-       long    now;
-       extern  s_char *timestampfil;
-       
-       if (!opt_MOB_ACCESS) {
-               pr("Command invalid - MOB_ACCESS is not enabled.\n");
-               return RET_FAIL;
+    FILE *fp;
+    long minites;
+    struct mob_acc_globals timestamps;
+    time_t now;
+
+    if (!opt_MOB_ACCESS) {
+       pr("Command invalid - MOB_ACCESS is not enabled.\n");
+       return RET_FAIL;
+    }
+    if (!player->argp[1])
+       return RET_SYN;
+    if (*player->argp[1] == 'c')
+       minites = -1;
+    else
+       minites = atol(player->argp[1]) * 60;
+    time(&now);
+    if ((fp = fopen(timestampfil, "rb+")) == NULL) {
+       logerror("Unable to edit timestamp file.");
+    } else {
+       rewind(fp);
+       fread(&timestamps, sizeof(timestamps), 1, fp);
+       if (minites < 0) {
+           fclose(fp);
+           if (updating_mob)
+               pr("Mobility updating is enabled.");
+           else {
+               pr("Mobility updating will come back on around %s",
+                  ctime(&timestamps.starttime));
+               pr("within 3 minutes, depending on when the server checks.");
+           }
+           return 0;
        }
-       if (!player->argp[1])
-               return RET_SYN;
-       if (*player->argp[1] == 'c')
-               minites = -1;
-       else
-               minites = atol(player->argp[1]) * 60;
-       time(&now);
-#if !defined(_WIN32)
-       if ((fp = fopen(timestampfil, "r+")) == NULL) {
-#else
-       if ((fp = fopen(timestampfil, "r+b")) == NULL) {
-#endif
-               logerror("Unable to edit timestamp file.");
-       } else {
-               rewind(fp);
-               fread(&timestamps, sizeof(timestamps), 1, fp);
-               if (minites < 0) {
-                       fclose(fp);
-                       if (updating_mob)
-                               pr("Mobility updating is enabled.");
-                       else {
-                               pr("Mobility updating will come back on around %s",
-                                  ctime(&timestamps.starttime));
-                               pr("within 3 minutes, depending on when the server checks.");
-                       }
-                       return 0;
-               }
-               timestamps.timestamp = now;
-               timestamps.starttime = now + minites;
-               rewind(fp);
-               fwrite(&timestamps, sizeof(timestamps), 1, fp);
-               fclose(fp);
-               if (now >= timestamps.starttime) {
-                       pr("Turning on mobility updating.");
-                       update_all_mob();
-                       updating_mob = 1;
-               } else if (updating_mob == 1) {
-                       pr("Turning off mobility updating.\n\r");
-                       pr("Mobility updating will come back on around %s",
-                          ctime(&timestamps.starttime));
-                       pr("within 3 minutes, depending on when the server checks.");
-                       update_all_mob();
-                       updating_mob = 0;
-               } else if (updating_mob == 0) {
-                       pr("Mobility updating is already off.\n\r");
-                       pr("Mobility updating will come back on around %s",
-                          ctime(&timestamps.starttime));
-                       pr("within 3 minutes, depending on when the server checks.");
-               }
+       timestamps.timestamp = now;
+       timestamps.starttime = now + minites;
+       rewind(fp);
+       fwrite(&timestamps, sizeof(timestamps), 1, fp);
+       fclose(fp);
+       if (now >= timestamps.starttime) {
+           pr("Turning on mobility updating.");
+           update_all_mob();
+           updating_mob = 1;
+       } else if (updating_mob == 1) {
+           pr("Turning off mobility updating.\n");
+           pr("Mobility updating will come back on around %s",
+              ctime(&timestamps.starttime));
+           pr("within 3 minutes, depending on when the server checks.");
+           update_all_mob();
+           updating_mob = 0;
+       } else if (updating_mob == 0) {
+           pr("Mobility updating is already off.\n");
+           pr("Mobility updating will come back on around %s",
+              ctime(&timestamps.starttime));
+           pr("within 3 minutes, depending on when the server checks.");
        }
-       
-       return 0;
+    }
+
+    return 0;
 }