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

Remove dead code for estimating defense

Browse source 
Clean up of intelligence_report().  Should have been done in commit
092a52f2.
This commit is contained in:
Markus Armbruster 2008-03-03 20:08:43 +01:00
parent 055c80a41f
commit 66406d8385
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -186,7 +186,7 @@ extern int lnd_take_casualty(int, struct ulist *, int);
extern void lnd_submil(struct lndstr *, int); extern void lnd_submil(struct lndstr *, int);
extern void lnd_takemob(struct emp_qelem *, double); extern void lnd_takemob(struct emp_qelem *, double);
extern int lnd_spyval(struct lndstr *); extern int lnd_spyval(struct lndstr *);
extern double intelligence_report(int, struct lndstr *, int, char *); extern void intelligence_report(int, struct lndstr *, int, char *);
extern int count_sect_units(struct sctstr *); extern int count_sect_units(struct sctstr *);
extern void count_units(struct shpstr *); extern void count_units(struct shpstr *);
extern void lnd_count_units(struct lndstr *); extern void lnd_count_units(struct lndstr *);

15
src/lib/subs/lndsub.c
View file

@ -327,19 +327,18 @@ lnd_spyval(struct lndstr *lp)
return lp->lnd_spy * (lp->lnd_effic / 100.0); return lp->lnd_spy * (lp->lnd_effic / 100.0);
} }
double void
intelligence_report(int destination, struct lndstr *lp, int spy, intelligence_report(int destination, struct lndstr *lp, int spy,
char *mess) char *mess)
{ {
struct lchrstr *lcp; struct lchrstr *lcp;
char buf1[80], buf2[80], buf3[80]; char buf1[80], buf2[80], buf3[80];
double estimate = 0.0; /* estimated defense value */
if (destination == 0) if (destination == 0)
return 0; return;
if (lp->lnd_own == 0) if (lp->lnd_own == 0)
return 0; return;
lcp = &lchr[(int)lp->lnd_type]; lcp = &lchr[(int)lp->lnd_type];
@ -352,8 +351,6 @@ intelligence_report(int destination, struct lndstr *lp, int spy,
else else
sprintf(buf1, "%s %s", mess, prland(lp)); sprintf(buf1, "%s %s", mess, prland(lp));
estimate = lp->lnd_item[I_MILIT];
if (chance((spy + lp->lnd_vis) / 20.0)) { if (chance((spy + lp->lnd_vis) / 20.0)) {
if (destination == player->cnum) if (destination == player->cnum)
pr(" (eff %d, mil %d", pr(" (eff %d, mil %d",
@ -363,7 +360,6 @@ intelligence_report(int destination, struct lndstr *lp, int spy,
sprintf(buf2, " (eff %d, mil %d", sprintf(buf2, " (eff %d, mil %d",
roundintby(lp->lnd_effic, 5), roundintby(lp->lnd_effic, 5),
roundintby(lp->lnd_item[I_MILIT], 10)); roundintby(lp->lnd_item[I_MILIT], 10));
estimate = lp->lnd_item[I_MILIT] * lp->lnd_effic / 100.0;
if (chance((spy + lp->lnd_vis) / 20.0)) { if (chance((spy + lp->lnd_vis) / 20.0)) {
int t; int t;
@ -390,11 +386,6 @@ intelligence_report(int destination, struct lndstr *lp, int spy,
if (destination != player->cnum) { if (destination != player->cnum) {
wu(0, destination, "%s%s%s", buf1, buf2, buf3); wu(0, destination, "%s%s%s", buf1, buf2, buf3);
} }
if (lp->lnd_ship < 0 || lcp->l_flags & L_MARINE)
estimate *= lp->lnd_def;
return estimate;
} }
/* Used by the spy command to count land units in a sector. If used /* Used by the spy command to count land units in a sector. If used