Update copyright notice

[empserver] / src / lib / update / revolt.c

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 95acd20e5ec8d8d32c885fb378aa874571e07757..f93c783e53b87838eeca6608603fe648416eed5e 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1997-2000
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -37,11 +38,13 @@
 #include "lost.h"
 #include "news.h"
 #include "nsc.h"
+#include "nuke.h"
 #include "path.h"
 #include "plane.h"
 #include "update.h"
 
 static void take_casualties(struct sctstr *, int);
+static void lnd_dies_fighting_che(struct lndstr *);
 
 void
 revolt(struct sctstr *sp)
@@ -159,7 +162,7 @@ guerrilla(struct sctstr *sp)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
 
        mil += lp->lnd_item[I_MILIT];
@@ -437,7 +440,7 @@ take_casualties(struct sctstr *sp, int mc)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
        nunits++;
        if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
@@ -454,7 +457,7 @@ take_casualties(struct sctstr *sp, int mc)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
        if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY))
            continue;
@@ -483,7 +486,7 @@ take_casualties(struct sctstr *sp, int mc)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
        if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
            continue;
@@ -513,18 +516,13 @@ take_casualties(struct sctstr *sp, int mc)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
        if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
            continue;
 
        mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT];
-       lp->lnd_effic = 0;
-       lnd_submil(lp, 1000);   /* Remove 'em all */
-       wu(0, lp->lnd_own, "%s dies fighting guerrillas in %s\n",
-          prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
-       makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
-       lp->lnd_own = 0;
+       lnd_dies_fighting_che(lp);
        if (mc <= 0)
            return;
     }
@@ -535,21 +533,73 @@ take_casualties(struct sctstr *sp, int mc)
     while (NULL != (lp = nxtitemp(&ni))) {
        if (lp->lnd_own != sp->sct_own)
            continue;
-       if (lp->lnd_ship >= 0 || lp->lnd_land >= 0)
+       if (lp->lnd_ship >= 0)
            continue;
        if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY))
            continue;
 
        mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT] * 2.0;
-       lp->lnd_effic = 0;
-       lnd_submil(lp, 1000);   /* Kill 'em all */
-       wu(0, lp->lnd_own, "%s dies fighting guerrillas in %s\n",
-          prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
-       makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
-       lp->lnd_own = 0;
+       lnd_dies_fighting_che(lp);
        if (mc <= 0)
            return;
     }
 
     /* Hmm.. everyone dead.. too bad */
 }
+
+static void
+lnd_dies_fighting_che(struct lndstr *lp)
+{
+    int i, j;
+    struct lndstr *clp;
+    struct plnstr *cpp;
+    struct nukstr *cnp;
+
+    lp->lnd_effic = 0;
+    lnd_submil(lp, 1000);      /* Remove 'em all */
+    wu(0, lp->lnd_own, "%s dies fighting guerrillas in %s\n",
+       prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
+    makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
+    lp->lnd_own = 0;
+
+    /* Take dead lp off its carrier */
+    if (lp->lnd_land >= 0) {
+       lnd_carrier_change(lp, EF_LAND, lp->lnd_land, -1);
+       lp->lnd_land = -1;
+    }
+
+    /* Unload lp's land unit cargo */
+    for (i = lnd_first_on_land(lp); i >= 0; i = lnd_next_on_unit(i)) {
+       clp = getlandp(i);
+       if (CANT_HAPPEN(!clp))
+           continue;
+       lnd_carrier_change(clp, EF_LAND, clp->lnd_land, -1);
+       clp->lnd_land = -1;
+    }
+
+    /* Destroy lp's plane cargo */
+    for (i = pln_first_on_land(lp); i >= 0; i = pln_next_on_unit(i)) {
+       cpp = getplanep(i);
+       if (CANT_HAPPEN(!cpp))
+           continue;
+       pln_carrier_change(cpp, EF_LAND, cpp->pln_land, -1);
+       makelost(EF_PLANE, cpp->pln_own, i, cpp->pln_x, cpp->pln_y);
+       wu(0, cpp->pln_own, "%s lost!\n", prplane(cpp));
+       cpp->pln_own = 0;
+       cpp->pln_effic = 0;
+       cpp->pln_land = -1;
+
+       j = nuk_on_plane(cpp);
+       if (j >= 0) {
+           cnp = getnukep(j);
+           if (CANT_HAPPEN(!cnp))
+               continue;
+           nuk_carrier_change(cnp, EF_PLANE, cnp->nuk_plane, -1);
+           makelost(EF_NUKE, cnp->nuk_own, j, cnp->nuk_x, cnp->nuk_y);
+           wu(0, cnp->nuk_own, "%s lost!\n", prnuke(cnp));
+           cnp->nuk_own = 0;
+           cnp->nuk_effic = 0;
+           cnp->nuk_plane = -1;
+       }
+    }
+}