License upgrade to GPL version 3 or later

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

diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index b81db848b4274b864fb1d0cc1ee722a82e698790..19cf108193b676712852f8e2f4522d758bccba39 100644 (file)
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,38 +14,31 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  control.c: Military control functions
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
+#include <config.h>
+
 #include "file.h"
-#include "path.h"
-#include "xy.h"
 #include "land.h"
-#include "nsc.h"
-#include "item.h"
 #include "prototypes.h"
+#include "sect.h"
 
 /*
  * Does the player->owner have military control of this sector?
- *
  */
 int
 military_control(struct sctstr *sp)
@@ -56,9 +49,9 @@ military_control(struct sctstr *sp)
 
     if (sp->sct_oldown != sp->sct_own) {
        snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
-       while (nxtitem(&ni, (s_char *)&land)) {
+       while (nxtitem(&ni, &land)) {
            if (land.lnd_own == sp->sct_own)
-               tot_mil += total_mil(&land);
+               tot_mil += land.lnd_item[I_MILIT];
        }
        if ((sp->sct_item[I_MILIT] + tot_mil) * 10 < sp->sct_item[I_CIVIL])
            return 0;