Update copyright notice

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

diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index d06c76bec785bb7f9eda077263e7d03b4b8e21e3..4245f7b4c77d109f62b5807ebb5b205dd69b3d73 100644 (file)
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,35 +19,27 @@
  *
  *  ---
  *
- *  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 <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.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)
@@ -60,7 +52,7 @@ military_control(struct sctstr *sp)
        snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
        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;