commands: Rename the command functions

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

diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index 12ce0270a593e5d9efed4e5d67e1f24688cf7e2b..de27306279c65676ee2ea2393c980b932a3ceadf 100644 (file)
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,47 +25,39 @@
  *  ---
  *
  *  hard.c: Increases the silo protection of a given missile
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
 #include "plane.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "commands.h"
 
 /*
  * harden <PLANE> <LEVEL>
  */
 int
-hard(void)
+c_harden(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];
-    long cash;
+    char buf[1024];
+    int 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)
+    p = getstarg(player->argp[2], "Increase by? ", buf);
+    if (!p || !*p)
        return RET_SYN;
     level = atoi(p);
     if (level < 0)
@@ -81,7 +72,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)
@@ -110,7 +101,7 @@ 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);
        sect.sct_item[I_HCM] = hcm - n;
        putsect(&sect);