Update copyright notice

[empserver] / src / lib / update / prepare.c

diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index d4cbc71234673c5173a26f91c7a27b0cec5e3a87..d2df79b58834fae0a79bde26e5cef638e804d8de 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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/>.
  *
  *  ---
  *
@@ -38,7 +37,6 @@
 #include "budg.h"
 #include "item.h"
 #include "land.h"
-#include "path.h"
 #include "player.h"
 #include "ship.h"
 #include "update.h"
@@ -80,11 +78,6 @@ prepare_sects(int etu, struct bp *bp)
        bp_set_from_sect(bp, sp);
        np = getnatp(sp->sct_own);
 
-#ifdef DEBUG
-       if (np->nat_stat == STAT_SANCT)
-           logerror("Prepare.c: country in sanctuary skipped production");
-#endif /* DEBUG */
-
        if (np->nat_stat != STAT_SANCT) {
            guerrilla(sp);
            do_plague(sp, np, etu);
@@ -101,7 +94,7 @@ prepare_sects(int etu, struct bp *bp)
 }
 
 void
-tax(struct sctstr *sp, struct natstr *np, int etu, long *pop, int *civ_tax,
+tax(struct sctstr *sp, struct natstr *np, int etu, int *pop, int *civ_tax,
     int *uw_tax, int *mil_pay)
 {
     *civ_tax = 0;