diff --git a/include/options.h b/include/options.h index 28a8e0cb..ffcb36e0 100644 --- a/include/options.h +++ b/include/options.h @@ -84,7 +84,6 @@ /*#define TRADESHIPS*//* Use Tradeships */ /*#define SLOW_WAR*//* Declaring war takes time */ /*#define SNEAK_ATTACK*//* Allows sneak attacks */ -#define ORBIT /* Satalites will orbit each update */ #define PINPOINTMISSILE /**/ #define FALLOUT /* Enables secondary effects caused by radiation */ #define SAIL /* A update routine to move ships */ diff --git a/include/optlist.h b/include/optlist.h index 017ca08f..517e7fba 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -73,7 +73,6 @@ extern int opt_NO_LCMS; extern int opt_NO_OIL; extern int opt_NO_PLAGUE; extern int opt_NUKEFAILDETONATE; -extern int opt_ORBIT; extern int opt_PINPOINTMISSILE; extern int opt_RES_POP; extern int opt_ROLLOVER_AVAIL; diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index f8723b42..5a146d58 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -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"); diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c index 54ecca84..880b1669 100644 --- a/src/lib/commands/pdump.c +++ b/src/lib/commands/pdump.c @@ -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; diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c index d70bc3e7..6436687a 100644 --- a/src/lib/commands/plan.c +++ b/src/lib/commands/plan.c @@ -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"); diff --git a/src/lib/global/options.c b/src/lib/global/options.c index 4ecda085..490b33be 100644 --- a/src/lib/global/options.c +++ b/src/lib/global/options.c @@ -225,12 +225,6 @@ int opt_SHOWPLANE = 1; int opt_SHOWPLANE = 0; #endif -#ifdef ORBIT -int opt_ORBIT = 1; -#else -int opt_ORBIT = 0; -#endif - #ifdef PINPOINTMISSILE int opt_PINPOINTMISSILE = 1; #else @@ -328,7 +322,6 @@ struct option_list Options[] = { {"NOMOBCOST", &opt_NOMOBCOST}, {"NONUKES", &opt_NONUKES}, {"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE}, - {"ORBIT", &opt_ORBIT}, {"PINPOINTMISSILE", &opt_PINPOINTMISSILE}, {"RES_POP", &opt_RES_POP}, {"SAIL", &opt_SAIL}, diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c index e06190ff..2ea598ea 100644 --- a/src/lib/update/plane.c +++ b/src/lib/update/plane.c @@ -93,7 +93,7 @@ prod_plane(int etus, int natnum, int *bp, int buildem) plp = &plchr[(int)pp->pln_type]; if (pp->pln_flags & PLN_LAUNCHED) { - if (opt_ORBIT && (buildem == 0)) { + if (buildem == 0) { if ((!player->simulation) && (plp->pl_flags & P_O) && (pp->pln_flags & PLN_LAUNCHED) &&