Update copyright notice

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

diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c
index f8ea26b72cdfffb959a5724d1882af85e5882212..4f9f6b25cbdcf304a92a2289e3b596338c4840f4 100644 (file)
--- a/src/lib/subs/bsanct.c
+++ b/src/lib/subs/bsanct.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  bsanct.c: Break Sanctuary subroutines
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2006-2013
  */
 
 #include <config.h>
@@ -58,13 +57,9 @@ bsanct(void)
            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;
+       if (s.sct_newtype == SCT_SANCT)
            s.sct_newtype = SCT_CAPIT;
-       } else {
-           s.sct_type = SCT_HIWAY;
-           s.sct_newtype = SCT_HIWAY;
-       }
+       s.sct_type = s.sct_newtype;
        game_tick_to_now(&s.sct_access);
        (void)putsect(&s);
        count++;