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

Factor lnd_dies_fighting_che() out of take_casualties()

Browse source
This commit is contained in:
Markus Armbruster 2011-07-09 17:19:42 +02:00
parent 8ccad0d779
commit 4c8d4228c8
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,7 @@
#include "update.h" #include "update.h"
static void take_casualties(struct sctstr *, int); static void take_casualties(struct sctstr *, int);
static void lnd_dies_fighting_che(struct lndstr *);
void void
revolt(struct sctstr *sp) revolt(struct sctstr *sp)
@ -519,12 +520,7 @@ take_casualties(struct sctstr *sp, int mc)
continue; continue;
mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT]; mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT];
lp->lnd_effic = 0; lnd_dies_fighting_che(lp);
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;
if (mc <= 0) if (mc <= 0)
return; return;
} }
@ -541,15 +537,21 @@ take_casualties(struct sctstr *sp, int mc)
continue; continue;
mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT] * 2.0; mc -= (lp->lnd_effic / 100.0) * lp->lnd_item[I_MILIT] * 2.0;
lp->lnd_effic = 0; lnd_dies_fighting_che(lp);
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;
if (mc <= 0) if (mc <= 0)
return; return;
} }
/* Hmm.. everyone dead.. too bad */ /* Hmm.. everyone dead.. too bad */
} }
static void
lnd_dies_fighting_che(struct lndstr *lp)
{
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;
}