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

(ORBIT, opt_ORBIT, Options, launch_sat, pdump, plan, prod_plane):

Browse source 
Remove nooption ORBIT.
This commit is contained in:
Markus Armbruster 2004-12-17 19:29:36 +00:00
parent a2284aac8d
commit 46608d6c83
7 changed files with 15 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/commands/laun.c
View file

@ -402,18 +402,15 @@ launch_sat(struct plnstr *pp, int sublaunch)
}
break;
}
if (opt_ORBIT) {
p = getstring("Geostationary orbit? ", buf);
if (p == 0)
return -1;
if (!check_plane_ok(pp))
return -1;
pp->pln_theta = 0;
pp->pln_flags |= PLN_SYNCHRONOUS;
if (*p == 0 || *p == 'n')
pp->pln_flags &= ~(PLN_SYNCHRONOUS);
}
/* end opt_ORBIT */
p = getstring("Geostationary orbit? ", buf);
if (p == 0)
return -1;
if (!check_plane_ok(pp))
return -1;
pp->pln_theta = 0;
pp->pln_flags |= PLN_SYNCHRONOUS;
if (*p == 0 || *p == 'n')
pp->pln_flags &= ~(PLN_SYNCHRONOUS);
pr("3... 2... 1... Blastoff!!!\n");
if (chance(0.07 + (100 - pp->pln_effic) / 100.0)) {
pr("KABOOOOM! Range safety officer detonates booster!\n");

5
src/lib/commands/pdump.c
View file

@ -275,10 +275,7 @@ pdump(void)
case 19:
if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) ==
P_O) {
pr(" %c",
opt_ORBIT ? (plane.
pln_flags & PLN_SYNCHRONOUS) ? 'Y' :
'N' : 'N');
pr(" %c", (plane.pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N');
} else
pr(" N");
break;

14
src/lib/commands/plan.c
View file

@ -57,10 +57,7 @@ plan(void)
if (nplanes++ == 0) {
if (player->god)
pr("own ");
pr(" # type x,y w eff mu def tech ran hard s/l L");
if (opt_ORBIT)
pr("S");
pr("B nuke\n");
pr(" # type x,y w eff mu def tech ran hard s/l LSB nuke\n");
}
if (player->god)
pr("%3d ", plane.pln_own);
@ -79,14 +76,11 @@ plan(void)
pr(" ");
if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) == P_O) {
pr(" %c", (plane.pln_flags & PLN_LAUNCHED) ? 'Y' : 'N');
pr("%c",
opt_ORBIT ? (plane.
pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N' :
' ');
pr("%c", (plane.pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N');
} else
pr(" ");
pr(" ");
if (plane.pln_nuketype != -1)
pr("%c %-5.5s",
pr(" %c %-5.5s",
plane.pln_flags & PLN_AIRBURST ? 'A' : 'G',
nchr[(int)plane.pln_nuketype].n_name);
pr("\n");