Update copyright notice

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

diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index 5edb9ba2927921f2e22babbd44b3666ec7eb8cb1..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-2000, 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,54 +19,44 @@
  *
  *  ---
  *
- *  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 "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "var.h"
+#include <config.h>
+
 #include "file.h"
-#include "path.h"
-#include "xy.h"
 #include "land.h"
-#include "nsc.h"
-#include "item.h"
-#include "deity.h"
 #include "prototypes.h"
+#include "sect.h"
 
 /*
  * Does the player->owner have military control of this sector?
- *
  */
 int
 military_control(struct sctstr *sp)
 {
-       int     tot_mil=0;
-       struct  nstr_item ni;
-       struct  lndstr land;
+    int tot_mil = 0;
+    struct nstr_item ni;
+    struct lndstr land;
 
-       if (sp->sct_oldown != sp->sct_own){
-               snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
-               while (nxtitem(&ni, (s_char *)&land)){
-                       if (land.lnd_own == sp->sct_own)
-                               tot_mil += total_mil(&land);
-               }
-               if ((getvar(V_MILIT, (s_char *)sp, EF_SECTOR)+tot_mil) * 10
-                       < getvar(V_CIVIL, (s_char *)sp, EF_SECTOR))
-                       return 0;
+    if (sp->sct_oldown != sp->sct_own) {
+       snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
+       while (nxtitem(&ni, &land)) {
+           if (land.lnd_own == sp->sct_own)
+               tot_mil += land.lnd_item[I_MILIT];
        }
+       if ((sp->sct_item[I_MILIT] + tot_mil) * 10 < sp->sct_item[I_CIVIL])
+           return 0;
+    }
 
-       return 1;
+    return 1;
 }