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

Make trade show exactly what's on sale, remove option SHOW_PLANE

Browse source 
Planes and land units on ships are sold along with the ship, but trade
showed them only when SHOWPLANE was enabled.  Show them always.

Planes on land units are not sold along with the land unit, but trade
showed them when SHOWPLANE was enabled.  Don't.
This commit is contained in:
Markus Armbruster 2008-09-16 19:11:18 -04:00
parent 4a44b51f8c
commit 3e15a8e226
4 changed files with 25 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/econfig-spec.h
View file

@ -181,8 +181,6 @@ EMPCF_OPT("RES_POP", opt_RES_POP,
"Population is limited by research")
EMPCF_OPT("SAIL", opt_SAIL,
"Enable sail command")
EMPCF_OPT("SHOWPLANE", opt_SHOWPLANE,
"Show planes and land units embarked on ships or land units up for trade")
EMPCF_OPT("SLOW_WAR", opt_SLOW_WAR,
"Declaring war takes time")
EMPCF_OPT("SUPER_BARS", opt_SUPER_BARS,

1
info/Options.t
View file

@ -4,7 +4,6 @@
.nf
The following options are from KSU code:
SHOWPLANE: planes/units on ships/units up for trade are shown
PINPOINT(etc): Missile exist which target ships instead of sectors
SAIL: another way to automatically move ships (may also be buggy)
DEMANDUPDATE: updates may be allowed on player demand

1
src/lib/global/options.c
View file

@ -59,7 +59,6 @@ int opt_NO_PLAGUE = 1;
int opt_PINPOINTMISSILE = 1;
int opt_RES_POP = 0;
int opt_SAIL = 1;
int opt_SHOWPLANE = 1;
int opt_SLOW_WAR = 0;
int opt_SUPER_BARS = 0;
int opt_TECH_POP = 0;

14
src/lib/subs/trdsub.c
View file

@ -129,7 +129,6 @@ trade_desc(struct trdstr *tp, union empobj_storage *tgp)
pr("%c:%d ", ichr[it].i_mnem, sp->shp_item[it]);
}
pr("] #%d", tp->trd_unitid);
if (opt_SHOWPLANE) {
snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, &plane)) {
pr("\n\t\t\t\t tech %3d %3d%% %s #%d",
@ -158,7 +157,6 @@ trade_desc(struct trdstr *tp, union empobj_storage *tgp)
}
}
}
}
getsect(sp->shp_x, sp->shp_y, &sect);
if (sect.sct_type != SCT_WATER)
pr(" in a %s %s",
@ -177,18 +175,6 @@ trade_desc(struct trdstr *tp, union empobj_storage *tgp)
pr("%c:%d ", ichr[it].i_mnem, lp->lnd_item[it]);
}
pr("] #%d", tp->trd_unitid);
if (opt_SHOWPLANE) {
snxtitem_cargo(&ni, EF_PLANE, EF_LAND, lp->lnd_uid);
while (nxtitem(&ni, &plane)) {
pr("\n\t\t\t\t tech %3d %3d%% %s #%d",
plane.pln_tech,
plane.pln_effic,
plchr[(int)plane.pln_type].pl_name, plane.pln_uid);
if (getnuke(nuk_on_plane(&plane), &nuke))
pr("(%s)", nchr[nuke.nuk_type].n_name);
}
}
getsect(lp->lnd_x, lp->lnd_y, &sect);
break;
case EF_PLANE:
pp = &tgp->plane;