Update copyright notice

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

diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index fd9a4c4f70490d0a1581764fba4e53581a53bc40..085f749514a22fde7c315f0bda0c7abd21d74a6d 100644 (file)
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.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,31 +19,24 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  hard.c: Increases the silo protection of a given missile
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
 #include "item.h"
 #include "plane.h"
-#include "nuke.h"
 #include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "commands.h"
 
 /*
  * harden <PLANE> <LEVEL>
@@ -54,16 +47,16 @@ hard(void)
     struct plchrstr *pcp;
     struct plnstr pln;
     int level;
-    s_char *p;
+    char *p;
     int hcm;
     int n;
     struct nstr_item ni;
     struct sctstr sect;
-    s_char buf[1024];
+    char buf[1024];
     long cash;
     struct natstr *natp;
 
-    if (!snxtitem(&ni, EF_PLANE, player->argp[1]))
+    if (!snxtitem(&ni, EF_PLANE, player->argp[1], NULL))
        return RET_SYN;
     if ((p = getstarg(player->argp[2], "Increase by? ", buf)) == 0
        || *p == 0)
@@ -73,7 +66,7 @@ hard(void)
        return RET_SYN;
     natp = getnatp(player->cnum);
     cash = natp->nat_money;
-    while (nxtitem(&ni, (s_char *)&pln)) {
+    while (nxtitem(&ni, &pln)) {
        if (!player->owner)
            continue;
        pcp = &plchr[(int)pln.pln_type];
@@ -81,7 +74,7 @@ hard(void)
            pr("%s isn't a missile!\n", prplane(&pln));
            continue;
        }
-       if (pln.pln_ship >= 0)  /* can't harden ssbns ... */
+       if (pln.pln_ship >= 0 || pln.pln_land >= 0)
            continue;
        n = level;
        if (level + pln.pln_harden > 127)
@@ -97,7 +90,7 @@ hard(void)
               prplane(&pln), xyas(pln.pln_x, pln.pln_y, player->cnum));
            continue;
        }
-       hcm = getvar(V_HCM, (s_char *)&sect, EF_SECTOR);
+       hcm = sect.sct_item[I_HCM];
        if (hcm == 0) {
            pr("No hcm in %s\n", xyas(pln.pln_x, pln.pln_y, player->cnum));
            continue;
@@ -110,9 +103,9 @@ hard(void)
        if (hcm <= n)
            n = hcm;
        pln.pln_harden += n;
-       player->dolcost += (5.0 * n);
+       player->dolcost += 5.0 * n;
        putplane(pln.pln_uid, &pln);
-       putvar(V_HCM, hcm - n, (s_char *)&sect, EF_SECTOR);
+       sect.sct_item[I_HCM] = hcm - n;
        putsect(&sect);
        pr("%s hardened to %d\n", prplane(&pln), pln.pln_harden);
     }