Use relations_with() for getrel(getnatp(US), THEM) where US!=THEM

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

diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index 3870b242b278ebda5ee761d378450db1df086147..e40a187af290d2e57b0d98772d6c707323d5c36c 100644 (file)
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,36 +19,27 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  assa.c: Hit the beaches!
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1997
  */
 
-#include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "var.h"
-#include "sect.h"
-#include "path.h"
-#include "news.h"
-#include "treaty.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
+#include <config.h>
+
 #include "combat.h"
 #include "commands.h"
+#include "mission.h"
+#include "path.h"
+#include "empobj.h"
+#include "unit.h"
 
 int
 assa(void)
@@ -63,12 +54,12 @@ assa(void)
     int a_spy = 0;             /* the best assaulter scout */
     double osupport = 1.0;     /* assault support */
     double dsupport = 1.0;     /* defense support */
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int n;
     int ourtotal;
     struct emp_qelem *qp, *next;
-    struct llist *llp;
+    struct ulist *llp;
     int rel;
 
     att_combat_init(off, EF_SHIP);
@@ -83,7 +74,7 @@ assa(void)
        return RET_SYN;
     if (!sarg_xy(p, &def->x, &def->y))
        return RET_SYN;
-    if (att_abort(A_ASSAULT, 0, def))
+    if (att_abort(A_ASSAULT, NULL, def))
        return RET_FAIL;
 
     /*
@@ -91,7 +82,7 @@ assa(void)
      */
 
     if ((off->shp_uid =
-        onearg(player->argp[2], "Assault from ship #")) < 0) {
+        onearg(player->argp[2], "Assault from ship # ")) < 0) {
        pr("You may only assault from one ship!\n");
        return RET_FAIL;
     }
@@ -119,7 +110,7 @@ assa(void)
     if (att_abort(A_ASSAULT, off, def)) {
        pr("Assault aborted\n");
        att_empty_attack(A_ASSAULT, 0, def);
-       return att_free_lists(&olist, 0);
+       return att_free_lists(&olist, NULL);
     }
 
     /* If we're assaulting our own sector, end here */
@@ -132,15 +123,11 @@ assa(void)
        return RET_OK;
     }
 
-    /*
-     * Estimate the defense strength and give the player a chance to abort
-     */
-
-    ototal = att_estimate_defense(A_ASSAULT, off, &olist, def, a_spy);
+    ototal = att_get_offense(A_ASSAULT, off, &olist, def);
     if (att_abort(A_ASSAULT, off, def)) {
        pr("Assault aborted\n");
        att_empty_attack(A_ASSAULT, 0, def);
-       return att_free_lists(&olist, 0);
+       return att_free_lists(&olist, NULL);
     }
 
     /*
@@ -162,8 +149,8 @@ assa(void)
     }
     for (qp = olist.q_forw; qp != &olist; qp = next) {
        next = qp->q_forw;
-       llp = (struct llist *)qp;
-       if (lchr[(int)llp->land.lnd_type].l_flags & L_SPY)
+       llp = (struct ulist *)qp;
+       if (lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY)
            continue;
        ourtotal++;
     }
@@ -176,34 +163,33 @@ assa(void)
 
        for (qp = olist.q_forw; qp != &olist; qp = next) {
            next = qp->q_forw;
-           llp = (struct llist *)qp;
-           rel = getrel(getnatp(def->own), player->cnum);
+           llp = (struct ulist *)qp;
+           rel = relations_with(def->own, player->cnum);
            if (chance(0.10) || rel == ALLIED || !def->own) {
-               pr("%s made it on shore safely.\n", prland(&llp->land));
-               llp->land.lnd_x = def->x;
-               llp->land.lnd_y = def->y;
-               llp->land.lnd_ship = -1;
-               putland(llp->land.lnd_uid, &llp->land);
+               pr("%s made it on shore safely.\n", prland(&llp->unit.land));
+               llp->unit.land.lnd_x = def->x;
+               llp->unit.land.lnd_y = def->y;
+               llp->unit.land.lnd_ship = -1;
+               putland(llp->unit.land.lnd_uid, &llp->unit.land);
            } else {
-               pr("%s was spotted", prland(&llp->land));
-               if (rel == HOSTILE || rel == AT_WAR || rel == SITZKRIEG ||
-                   rel == MOBILIZATION) {
+               pr("%s was spotted", prland(&llp->unit.land));
+               if (rel <= HOSTILE) {
                    wu(0, def->own, "%s spy shot and killed in %s.\n",
                       cname(player->cnum), xyas(def->x, def->y,
                                                 def->own));
                    pr(" and was killed in the attempt.\n");
-                   llp->land.lnd_effic = 0;
-                   putland(llp->land.lnd_uid, &llp->land);
-                   lnd_delete(llp, "");
+                   llp->unit.land.lnd_effic = 0;
+                   putland(llp->unit.land.lnd_uid, &llp->unit.land);
+                   lnd_delete(llp);
                } else {
                    wu(0, def->own, "%s spy spotted in %s.\n",
                       cname(player->cnum), xyas(def->x, def->y,
                                                 def->own));
                    pr(" but made it ok.\n");
-                   llp->land.lnd_x = def->x;
-                   llp->land.lnd_y = def->y;
-                   llp->land.lnd_ship = -1;
-                   putland(llp->land.lnd_uid, &llp->land);
+                   llp->unit.land.lnd_x = def->x;
+                   llp->unit.land.lnd_y = def->y;
+                   llp->unit.land.lnd_ship = -1;
+                   putland(llp->unit.land.lnd_uid, &llp->unit.land);
                }
            }
        }