License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c
index 0c5835efd205230126e825b4b46522f9409d1374..e31956d67c9d5c423648270028dfaec073031237 100644 (file)
--- a/src/lib/commands/fort.c
+++ b/src/lib/commands/fort.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,37 +14,27 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  fort.c: Increase the fortification value of land units
- * 
+ *
  *  Known contributors to this file:
  *    Steve McClure, 1999
- *     
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "deity.h"
-#include "file.h"
-#include "commands.h"
+#include <config.h>
 
-static int is_engineer(int, int);
+#include "commands.h"
+#include "land.h"
+#include "optlist.h"
 
 int
 fort(void)
@@ -52,29 +42,22 @@ fort(void)
     int nunits;
     struct nstr_item ni;
     struct lndstr land;
-    int fort_amt, hard_amt, mob_used;
-    int eng;
-    s_char *p;
-    extern int land_mob_max;
-    s_char buf[1024];
+    int fort_amt, hard_amt;
+    char *p;
+    char buf[1024];
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
     p = getstarg(player->argp[2], "Amount: ", buf);
-    if (p == 0 || *p == 0)
+    if (!p || !*p)
        return RET_SYN;
     fort_amt = atoi(p);
     if (fort_amt > land_mob_max)
        fort_amt = land_mob_max;
     nunits = 0;
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (!player->owner || land.lnd_own == 0)
            continue;
-       if (land.lnd_type < 0 || land.lnd_type > lnd_maxno) {
-           pr("bad unit type %d (#%d)\n", land.lnd_type, ni.cur);
-           continue;
-       }
-
        getland(land.lnd_uid, &land);
        if (land.lnd_mobil < 0)
            continue;
@@ -82,6 +65,11 @@ fort(void)
            pr("%s is on a ship and can't be fortified\n", prland(&land));
            continue;
        }
+       if (land.lnd_land >= 0) {
+           pr("%s is on a land unit and can't be fortified\n",
+              prland(&land));
+           continue;
+       }
 
        hard_amt = fort_amt;
 
@@ -89,45 +77,17 @@ fort(void)
           use all mobility down to leaving 67 left. */
        if (hard_amt < 0) {
            hard_amt = land.lnd_mobil + hard_amt;
-           if (hard_amt < 0)
-               continue;
        }
+       if (hard_amt <= 0)
+           continue;
 
-       nunits++;
-
-       hard_amt = min(land.lnd_mobil, hard_amt);
-
-       if ((land.lnd_harden + hard_amt) > land_mob_max)
-           hard_amt = land_mob_max - land.lnd_harden;
-
-       eng = is_engineer(land.lnd_x, land.lnd_y);
-
-       if (eng)
-           hard_amt = ((float)hard_amt * 1.5);
-
-       if ((land.lnd_harden + hard_amt) > land_mob_max)
-           hard_amt = land_mob_max - land.lnd_harden;
-
-       /* Ok, set the mobility used */
-       mob_used = hard_amt;
-
-       /* Now, if an engineer helped, it's really only 2/3rds of
-          that */
-       if (eng)
-           mob_used = (int)((float)mob_used / 1.5);
-
-       /* If we increased it, but not much, we gotta take at least 1
-          mob point. */
-       if (mob_used <= 0 && hard_amt > 0)
-           mob_used = 1;
-
-       land.lnd_mobil -= mob_used;
-       if (land.lnd_mobil < 0)
-           land.lnd_mobil = 0;
-
-       land.lnd_harden += hard_amt;
-       land.lnd_harden = min(land.lnd_harden, land_mob_max);
+       if (lnd_fortify(&land, hard_amt) <= 0) {
+           pr("%s can't be fortified%s\n", prland(&land),
+              land.lnd_harden >= land_mob_max ? " any further" : "");
+           continue;
+       }
 
+       nunits++;
        pr("%s hardened to %d\n", prland(&land), land.lnd_harden);
 
        putland(land.lnd_uid, &land);
@@ -142,18 +102,3 @@ fort(void)
        pr("%d unit%s\n", nunits, splur(nunits));
     return RET_OK;
 }
-
-static int
-is_engineer(int x, int y)
-{
-    struct nstr_item ni;
-    struct lndstr land;
-
-    snxtitem_xy(&ni, EF_LAND, x, y);
-    while (nxtitem(&ni, (s_char *)&land)) {
-       if (lchr[(int)land.lnd_type].l_flags & L_ENGINEER)
-           return 1;
-    }
-
-    return 0;
-}