Fix trailing whitespace

[empserver] / src / lib / subs / bsanct.c

diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c
index f784091bd2397cf0b361a52ad37d4d9e7358f0f1..11b89efad8a5cd8e04fbe418769d3b6bc6489680 100644 (file)
--- a/src/lib/subs/bsanct.c
+++ b/src/lib/subs/bsanct.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,60 +19,58 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  bsanct.c: Break Sanctuary subroutines
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "news.h"
-#include "path.h"
+#include <config.h>
+
 #include "file.h"
-#include "deity.h"
+#include "game.h"
+#include "news.h"
+#include "player.h"
 #include "prototypes.h"
+#include "sect.h"
 
 void
 bsanct(void)
 {
-       register int count;
-       struct  sctstr s;
-       struct  nstr_sect nstr;
+    int count;
+    struct sctstr s;
+    struct nstr_sect nstr;
 
-       if (player->god)
-               return;
-       count = 0;
-       snxtsct(&nstr, "*");
-       while (nxtsct(&nstr, &s)) {
-               if (!player->owner)
-                       continue;
-               if (s.sct_type != SCT_SANCT)
-                       continue;
-               pr("%s is no longer a sanctuary.\n",
-                       xyas(s.sct_x, s.sct_y, player->cnum));
-               if (s.sct_effic == 100) {
-                       s.sct_type = SCT_CAPIT;
-                       s.sct_newtype = SCT_CAPIT;
-               } else {
-                       s.sct_type = SCT_HIWAY;
-                       s.sct_newtype = SCT_HIWAY;
-               }
-               time(&s.sct_access);
-               (void) putsect(&s);
-               count++;
+    if (player->god)
+       return;
+    count = 0;
+    snxtsct_all(&nstr);
+    while (nxtsct(&nstr, &s)) {
+       if (!player->owner)
+           continue;
+       if (s.sct_type != SCT_SANCT)
+           continue;
+       pr("%s is no longer a sanctuary.\n",
+          xyas(s.sct_x, s.sct_y, player->cnum));
+       if (s.sct_effic == 100) {
+           s.sct_type = SCT_CAPIT;
+           s.sct_newtype = SCT_CAPIT;
+       } else {
+           s.sct_type = SCT_HIWAY;
+           s.sct_newtype = SCT_HIWAY;
        }
-       if (count > 0)
-               nreport(player->cnum, N_BROKE_SANCT, 0, 1);
+       game_tick_to_now(&s.sct_access);
+       (void)putsect(&s);
+       count++;
+    }
+    if (count > 0) {
+       game_note_bsanct();
+       nreport(player->cnum, N_BROKE_SANCT, 0, 1);
+    }
 }