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

Split get_land() into get_oland() and get_dland() & simplify

Browse source
This commit is contained in:
Markus Armbruster 2010-06-19 17:54:44 +02:00
parent 8e4d898f01
commit 1f080ef570
1 changed files with 47 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/lib/subs/attsub.c
View file

@ -83,7 +83,8 @@ static void send_reacting_units_home(struct emp_qelem *list);
static int take_def(int combat_mode, struct emp_qelem *list, static int take_def(int combat_mode, struct emp_qelem *list,
struct combat *off, struct combat *def); struct combat *off, struct combat *def);
static int get_land(int, struct combat *, struct ulist *); static int get_oland(int, struct ulist *);
static int get_dland(struct combat *, struct ulist *);
char *att_mode[] = { char *att_mode[] = {
/* must match combat types in combat.h */ /* must match combat types in combat.h */
@ -1277,8 +1278,7 @@ get_ototal(int combat_mode, struct combat *off, struct emp_qelem *olist,
for (qp = olist->q_forw; qp != olist; qp = next) { for (qp = olist->q_forw; qp != olist; qp = next) {
next = qp->q_forw; next = qp->q_forw;
llp = (struct ulist *)qp; llp = (struct ulist *)qp;
if (check && if (check && !get_oland(combat_mode, llp))
!get_land(combat_mode, NULL, llp))
continue; continue;
if (combat_mode == A_ATTACK) { if (combat_mode == A_ATTACK) {
w = -1; w = -1;
@ -1327,7 +1327,7 @@ get_dtotal(struct combat *def, struct emp_qelem *list, double dsupport,
for (qp = list->q_forw; qp != list; qp = next) { for (qp = list->q_forw; qp != list; qp = next) {
next = qp->q_forw; next = qp->q_forw;
llp = (struct ulist *)qp; llp = (struct ulist *)qp;
if (check && !get_land(A_DEFEND, def, llp)) if (check && !get_dland(def, llp))
continue; continue;
d_unit = defense_val(&llp->unit.land); d_unit = defense_val(&llp->unit.land);
if (!llp->supplied) if (!llp->supplied)
@ -1345,29 +1345,15 @@ get_dtotal(struct combat *def, struct emp_qelem *list, double dsupport,
*/ */
static int static int
get_land(int combat_mode, struct combat *def, struct ulist *llp) get_oland(int combat_mode, struct ulist *llp)
{ {
struct lndstr *lp = &llp->unit.land; struct lndstr *lp = &llp->unit.land;
char buf[512]; char buf[512];
getland(llp->unit.land.lnd_uid, lp); getland(llp->unit.land.lnd_uid, lp);
if (lp->lnd_effic < LAND_MINEFF) {
sprintf(buf, "was destroyed and is no longer a part of the %s",
att_mode[combat_mode]);
lnd_delete(llp, buf);
return 0;
}
if (combat_mode == A_DEFEND) {
if (lp->lnd_x != def->x || lp->lnd_y != def->y) {
lnd_delete(llp,
"left to go fight another battle and is no longer a part of the defense");
return 0;
}
} else {
if (lp->lnd_own != player->cnum) { if (lp->lnd_own != player->cnum) {
sprintf(buf, sprintf(buf, "was destroyed and is no longer a part of the %s",
"was destroyed and is no longer a part of the %s",
att_mode[combat_mode]); att_mode[combat_mode]);
lnd_delete(llp, buf); lnd_delete(llp, buf);
return 0; return 0;
@ -1384,9 +1370,31 @@ get_land(int combat_mode, struct combat *def, struct ulist *llp)
llp->eff, lp->lnd_effic); llp->eff, lp->lnd_effic);
lnd_print(llp, buf); lnd_print(llp, buf);
} }
}
llp->eff = llp->unit.land.lnd_effic;
llp->eff = llp->unit.land.lnd_effic;
return 1;
}
static int
get_dland(struct combat *def, struct ulist *llp)
{
struct lndstr *lp = &llp->unit.land;
char buf[512];
getland(llp->unit.land.lnd_uid, lp);
if (lp->lnd_effic < LAND_MINEFF) {
sprintf(buf, "was destroyed and is no longer a part of the defense");
lnd_delete(llp, buf);
return 0;
}
if (lp->lnd_x != def->x || lp->lnd_y != def->y) {
lnd_delete(llp,
"left to go fight another battle and is no longer a part of the defense");
return 0;
}
llp->eff = llp->unit.land.lnd_effic;
return 1; return 1;
} }
@ -1447,7 +1455,7 @@ put_land(struct emp_qelem *list)
emp_remque((struct emp_qelem *)llp); emp_remque((struct emp_qelem *)llp);
free(llp); free(llp);
} else } else
get_land(A_ATTACK, NULL, llp); get_oland(A_ATTACK, llp);
} }
} }
@ -2289,7 +2297,7 @@ ask_move_in(struct combat *off, struct emp_qelem *olist,
*answerp = 'N'; *answerp = 'N';
if (*answerp == 'Y') if (*answerp == 'Y')
continue; continue;
if (!get_land(A_ATTACK, def, llp)) if (!get_oland(A_ATTACK, llp))
continue; continue;
if (*answerp != 'N') { if (*answerp != 'N') {
sprintf(prompt, "Move in with %s (%c %d%%) [ynYNq?] ", sprintf(prompt, "Move in with %s (%c %d%%) [ynYNq?] ",
@ -2299,7 +2307,7 @@ ask_move_in(struct combat *off, struct emp_qelem *olist,
*answerp = att_prompt(prompt, llp->unit.land.lnd_army); *answerp = att_prompt(prompt, llp->unit.land.lnd_army);
if (player->aborted || att_get_combat(def, 0) < 0) if (player->aborted || att_get_combat(def, 0) < 0)
*answerp = 'N'; *answerp = 'N';
if (!get_land(A_ATTACK, def, llp)) if (!get_oland(A_ATTACK, llp))
continue; continue;
} }
if (*answerp == 'y' || *answerp == 'Y') if (*answerp == 'y' || *answerp == 'Y')
@ -2315,7 +2323,7 @@ ask_move_in(struct combat *off, struct emp_qelem *olist,
for (qp = olist->q_forw; qp != olist; qp = next) { for (qp = olist->q_forw; qp != olist; qp = next) {
next = qp->q_forw; next = qp->q_forw;
llp = (struct ulist *)qp; llp = (struct ulist *)qp;
if (!get_land(A_ATTACK, def, llp)) if (!get_oland(A_ATTACK, llp))
continue; continue;
sprintf(buf, "stays in %s", sprintf(buf, "stays in %s",
xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y,
@ -2344,7 +2352,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist,
for (qp = olist->q_forw; qp != olist; qp = next) { for (qp = olist->q_forw; qp != olist; qp = next) {
next = qp->q_forw; next = qp->q_forw;
llp = (struct ulist *)qp; llp = (struct ulist *)qp;
if (!get_land(combat_mode, def, llp)) if (!get_oland(combat_mode, llp))
continue; continue;
take_move_in_mob(combat_mode, llp, off, def); take_move_in_mob(combat_mode, llp, off, def);
llp->unit.land.lnd_x = def->x; llp->unit.land.lnd_x = def->x;