empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't leave cargo stuck on land unit killed by che

Browse source 
When che destroy a land unit, any embarked units remain stuck on their
now dead carrier.  Closely related to and same impact as the bug fixed
in commit 8ccad0d7.  Broken since Chainsaw 3 added land units.

The obvious fix would be to match what normally happens when a carrier
gets destroyed: destroy the cargo.  Requires recursion.  To keep
things as simple as possible, destroy plane cargo, but unload land
unit cargo.  That way, the only cargo of cargo to visit are nukes on
planes.

Unloading the land units creates another problem, which will be
addressed in the next commit.
This commit is contained in:
Markus Armbruster 2011-07-09 17:46:40 +02:00
parent 4c8d4228c8
commit 7aba25e826
1 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/lib/update/revolt.c
View file

@ -29,6 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1986 * Dave Pare, 1986
* Steve McClure, 1997-2000 * Steve McClure, 1997-2000
* Markus Armbruster, 2004-2011
*/ */
#include <config.h> #include <config.h>
@ -37,6 +38,7 @@
#include "lost.h" #include "lost.h"
#include "news.h" #include "news.h"
#include "nsc.h" #include "nsc.h"
#include "nuke.h"
#include "path.h" #include "path.h"
#include "plane.h" #include "plane.h"
#include "update.h" #include "update.h"
@ -548,10 +550,50 @@ take_casualties(struct sctstr *sp, int mc)
static void static void
lnd_dies_fighting_che(struct lndstr *lp) lnd_dies_fighting_che(struct lndstr *lp)
{ {
int i, j;
struct lndstr *clp;
struct plnstr *cpp;
struct nukstr *cnp;
lp->lnd_effic = 0; lp->lnd_effic = 0;
lnd_submil(lp, 1000); /* Remove 'em all */ lnd_submil(lp, 1000); /* Remove 'em all */
wu(0, lp->lnd_own, "%s dies fighting guerrillas in %s\n", wu(0, lp->lnd_own, "%s dies fighting guerrillas in %s\n",
prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own)); 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); makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
lp->lnd_own = 0; lp->lnd_own = 0;
/* 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;
}
}
} }