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

1
include/options.h
View file

@ -84,7 +84,6 @@
/*#define TRADESHIPS*//* Use Tradeships */ /*#define TRADESHIPS*//* Use Tradeships */
/*#define SLOW_WAR*//* Declaring war takes time */ /*#define SLOW_WAR*//* Declaring war takes time */
/*#define SNEAK_ATTACK*//* Allows sneak attacks */ /*#define SNEAK_ATTACK*//* Allows sneak attacks */
#define ORBIT /* Satalites will orbit each update */
#define PINPOINTMISSILE /**/ #define PINPOINTMISSILE /**/
#define FALLOUT /* Enables secondary effects caused by radiation */ #define FALLOUT /* Enables secondary effects caused by radiation */
#define SAIL /* A update routine to move ships */ #define SAIL /* A update routine to move ships */

1
include/optlist.h
View file

@ -73,7 +73,6 @@ extern int opt_NO_LCMS;
extern int opt_NO_OIL; extern int opt_NO_OIL;
extern int opt_NO_PLAGUE; extern int opt_NO_PLAGUE;
extern int opt_NUKEFAILDETONATE; extern int opt_NUKEFAILDETONATE;
extern int opt_ORBIT;
extern int opt_PINPOINTMISSILE; extern int opt_PINPOINTMISSILE;
extern int opt_RES_POP; extern int opt_RES_POP;
extern int opt_ROLLOVER_AVAIL; extern int opt_ROLLOVER_AVAIL;

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

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

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

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

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

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

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

@ -225,12 +225,6 @@ int opt_SHOWPLANE = 1;
int opt_SHOWPLANE = 0; int opt_SHOWPLANE = 0;
#endif #endif
#ifdef ORBIT
int opt_ORBIT = 1;
#else
int opt_ORBIT = 0;
#endif
#ifdef PINPOINTMISSILE #ifdef PINPOINTMISSILE
int opt_PINPOINTMISSILE = 1; int opt_PINPOINTMISSILE = 1;
#else #else
@ -328,7 +322,6 @@ struct option_list Options[] = {
{"NOMOBCOST", &opt_NOMOBCOST}, {"NOMOBCOST", &opt_NOMOBCOST},
{"NONUKES", &opt_NONUKES}, {"NONUKES", &opt_NONUKES},
{"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE}, {"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE},
{"ORBIT", &opt_ORBIT},
{"PINPOINTMISSILE", &opt_PINPOINTMISSILE}, {"PINPOINTMISSILE", &opt_PINPOINTMISSILE},
{"RES_POP", &opt_RES_POP}, {"RES_POP", &opt_RES_POP},
{"SAIL", &opt_SAIL}, {"SAIL", &opt_SAIL},

2
src/lib/update/plane.c
View file

@ -93,7 +93,7 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
plp = &plchr[(int)pp->pln_type]; plp = &plchr[(int)pp->pln_type];
if (pp->pln_flags & PLN_LAUNCHED) { if (pp->pln_flags & PLN_LAUNCHED) {
if (opt_ORBIT && (buildem == 0)) { if (buildem == 0) {
if ((!player->simulation) && if ((!player->simulation) &&
(plp->pl_flags & P_O) && (plp->pl_flags & P_O) &&
(pp->pln_flags & PLN_LAUNCHED) && (pp->pln_flags & PLN_LAUNCHED) &&