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 97b138c4ad21e27a8ac63973bf49f8194497a3d5..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-2009, 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
@@ -74,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;
 
     /*
@@ -110,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 */
@@ -127,7 +127,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);
     }
 
     /*
@@ -164,7 +164,7 @@ assa(void)
        for (qp = olist.q_forw; qp != &olist; qp = next) {
            next = qp->q_forw;
            llp = (struct ulist *)qp;
-           rel = getrel(getnatp(def->own), player->cnum);
+           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->unit.land));
                llp->unit.land.lnd_x = def->x;
@@ -173,15 +173,14 @@ assa(void)
                putland(llp->unit.land.lnd_uid, &llp->unit.land);
            } else {
                pr("%s was spotted", prland(&llp->unit.land));
-               if (rel == HOSTILE || rel == AT_WAR || rel == SITZKRIEG ||
-                   rel == MOBILIZATION) {
+               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->unit.land.lnd_effic = 0;
                    putland(llp->unit.land.lnd_uid, &llp->unit.land);
-                   lnd_delete(llp, NULL);
+                   lnd_delete(llp);
                } else {
                    wu(0, def->own, "%s spy spotted in %s.\n",
                       cname(player->cnum), xyas(def->x, def->y,