Update copyright notice

[empserver] / src / lib / subs / lndsub.c

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index b370ac3a8732abfe44480fac17cf7fa882648a3f..11d653f03e4f6dc26c5d847c38eabdf6b80fbecd 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2004-2015
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
@@ -40,7 +40,6 @@
 #include "combat.h"
 #include "damage.h"
 #include "empobj.h"
-#include "file.h"
 #include "misc.h"
 #include "mission.h"
 #include "news.h"
@@ -85,12 +84,6 @@ attack_val(int combat_mode, struct lndstr *lp)
 
     lcp = &lchr[(int)lp->lnd_type];
 
-/* Spies always count as 1 during assaults.  If they are the only ones
-   in the assault, they get to sneak on anyway. */
-
-    if (lcp->l_flags & L_SPY && combat_mode == A_ASSAULT)
-       return 1;
-
     men = lp->lnd_item[I_MILIT];
     value = men * lnd_att(lp) * lp->lnd_effic / 100.0;
 
@@ -180,20 +173,20 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
     signed char orig;
     int mob;
 
+    if (CANT_HAPPEN(lchr[llp->unit.land.lnd_type].l_flags & L_SPY))
+       return 0;
+
     taken = llp->unit.land.lnd_item[I_MILIT];
-    /* Spies always die */
-    if (lchr[llp->unit.land.lnd_type].l_flags & L_SPY)
-       llp->unit.land.lnd_effic = 0;
-    else {
-       eff_eq = ldround(cas * 100.0 /
-           lchr[llp->unit.land.lnd_type].l_item[I_MILIT], 1);
-       llp->unit.land.lnd_effic -= eff_eq;
-       lnd_submil(&llp->unit.land, cas);
-    }
+    eff_eq = ldround(cas * 100.0 /
+                    lchr[llp->unit.land.lnd_type].l_item[I_MILIT], 1);
+    llp->unit.land.lnd_effic -= eff_eq;
+    lnd_submil(&llp->unit.land, cas);
 
     if (llp->unit.land.lnd_effic < LAND_MINEFF) {
-       sprintf(buf, "dies %s %s!",
-               combat_mode ? att_mode[combat_mode] : "defending",
+       if (llp->unit.land.lnd_own == player->cnum)
+           pr("\n");
+       sprintf(buf, "dies %sing %s!",
+               att_mode[combat_mode],
                xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y,
                     llp->unit.land.lnd_own));
        lnd_print(llp->unit.land.lnd_own, llp, buf);
@@ -220,7 +213,8 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 
     ret_chance = llp->unit.land.lnd_retreat - llp->unit.land.lnd_effic;
     if (pct_chance(ret_chance)) {
-       pr("\n");
+       if (llp->unit.land.lnd_own == player->cnum)
+           pr("\n");
        lnd_print(llp->unit.land.lnd_own, llp, "fails morale check!");
        llp->unit.land.lnd_mission = 0;
        llp->unit.land.lnd_harden = 0;
@@ -370,7 +364,7 @@ intelligence_report(natid destination, struct lndstr *lp, int spy,
            buf2[0] = buf3[0] = 0;
        }
        if (destination == player->cnum)
-           pr("%s%s%s", buf1, buf2, buf3);
+           pr("%s%s%s\n", buf1, buf2, buf3);
        else
            wu(0, destination, "%s%s%s\n", buf1, buf2, buf3);
     }
@@ -954,7 +948,8 @@ lnd_mobcost(struct lndstr *lp, struct sctstr *sp)
 
 /*
  * Ask user to confirm sector abandonment, if any.
- * All land units in @list must be in the same sector.
+ * All land units in @list must be in the same sector, owned by the
+ * player, and not loaded onto anything.
  * If removing the land units in @list would abandon their sector, ask
  * the user to confirm.
  * Return zero when abandonment was declined, else non-zero.
@@ -992,7 +987,7 @@ lnd_mar_dir(struct emp_qelem *list, int dir, natid actor)
     coord newx;
     coord newy;
     int move;
-    int rel;
+    enum relations rel;
     int oldown;
 
     if (CANT_HAPPEN(QEMPTY(list)))