Fix trailing whitespace

[empserver] / src / lib / commands / anti.c

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index 981fe4bd0a460465276bc546406393a2811ed915..0022c92e6abd5fe7cbc9471a9b16db5b66675f84 100644 (file)
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,37 +19,26 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  anti.c: Take action against che
- * 
+ *
  *  Known contributors to this file:
  *     Pat Loney, 1992
  *     Steve McClure, 1997
  */
 
+#include <config.h>
 
-#include <stdio.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
+#include "lost.h"
 #include "optlist.h"
 
-extern int etu_per_update;
-extern int sect_mob_neg_factor;
 /*
  * format: anti <SECT>
  */
@@ -59,7 +48,6 @@ anti(void)
     struct sctstr sect;
     int nsect;
     struct nstr_sect nstr;
-    int cond[I_MAX + 1];
     int mil, che, target;
     int avail_mil;
     int amil, ache;
@@ -67,7 +55,6 @@ anti(void)
     double odds, damil, dache;
     int mob;
     int n_cheleft;
-    extern double hap_fact();
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -80,10 +67,9 @@ anti(void)
            pr("  sect    subversion activity report\n");
            pr("  ----    --------------------------\n");
        }
-       getvec(VT_COND, cond, (char *)&sect, EF_SECTOR);
-       mil = getvar(V_MILIT, (char *)&sect, EF_SECTOR);
-       che = get_che_value(cond[C_CHE]);
-       target = get_che_cnum(cond[C_CHE]);
+       mil = sect.sct_item[I_MILIT];
+       che = sect.sct_che;
+       target = sect.sct_che_target;
        avail_mil = sect.sct_mobil / 2;
        if (mil <= avail_mil)
            avail_mil = mil;
@@ -92,7 +78,8 @@ anti(void)
            pr("No available mil or mob in sector.\n");
            continue;
        }
-       pr("Sector mobility/troop strength will allow %d troops to engage.\n", avail_mil);
+       pr("Sector mobility/troop strength will allow %d troops to engage.\n",
+          avail_mil);
 
        if (target == player->cnum) {
            amil = mil;
@@ -117,11 +104,10 @@ anti(void)
            }
            if (mil - milkilled > 0) {
                sect.sct_mobil = sect.sct_mobil - chekilled - milkilled;
-               putvar(V_MILIT, mil - milkilled, (char *)&sect, EF_SECTOR);
+               sect.sct_item[I_MILIT] = mil - milkilled;
                if (ache == 0)
-                   cond[C_CHE] = 0;
-               set_che_value(cond[C_CHE], ache);
-               putvar(V_CHE, cond[C_CHE], (char *)&sect, EF_SECTOR);
+                   sect.sct_che_target = 0;
+               sect.sct_che = ache;
                putsect(&sect);
                pr("          Body count:  Military %d - Guerillas %d.\n",
                   milkilled, chekilled);
@@ -144,17 +130,14 @@ anti(void)
                    /* Ok, now leave anywhere from 16% to 25% of the che */
                    n_cheleft = (ache / (n_cheleft + 3));
                    ache -= n_cheleft;
-                   set_che_value(cond[C_CHE], n_cheleft);
-               } else
-                   cond[C_CHE] = 0;
-               putvar(V_MILIT, ache, (char *)&sect, EF_SECTOR);
-               putvar(V_CHE, cond[C_CHE], (char *)&sect, EF_SECTOR);
+                   sect.sct_che = n_cheleft;
+               } else {
+                   sect.sct_che = 0;
+                   sect.sct_che_target = 0;
+               }
+               sect.sct_item[I_MILIT] = ache;
                if (sect.sct_own == sect.sct_oldown)
                    sect.sct_oldown = 0;
-               makelost(EF_SECTOR, sect.sct_own, 0, sect.sct_x,
-                        sect.sct_y);
-               makenotlost(EF_SECTOR, sect.sct_oldown, 0, sect.sct_x,
-                           sect.sct_y);
                sect.sct_own = sect.sct_oldown;
                sect.sct_off = 1;       /* Turn the sector off */
                putsect(&sect);