projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial merge of I/O management.
[super-star-trek.git]
/
planets.c
diff --git
a/planets.c
b/planets.c
index ae7a7aad880e354214f97808eedf27afb819f99c..5ed87df431216c5bc03e90e79c361fd5115c15b2 100644
(file)
--- a/
planets.c
+++ b/
planets.c
@@
-78,16
+78,11
@@
void orbit(void) {
height = (1400.+7200.*Rand());
prout("Sulu- \"Entered orbit at altitude %.2f kilometers.\"", height);
inorbit = 1;
height = (1400.+7200.*Rand());
prout("Sulu- \"Entered orbit at altitude %.2f kilometers.\"", height);
inorbit = 1;
-#ifdef SERGEEV
ididit=1;
ididit=1;
-#endif /* SERGEEV */
}
void sensor(void) {
}
void sensor(void) {
-#ifdef SERGEEV
- if (game.damage[DSRSENS] != 0.0) return;
- if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
-#else
+#ifndef SERGEEV
skip(1);
chew();
if (game.damage[DSRSENS] != 0.0) {
skip(1);
chew();
if (game.damage[DSRSENS] != 0.0) {
@@
-98,7
+93,9
@@
void sensor(void) {
prout("No planet in this quadrant.");
return;
}
prout("No planet in this quadrant.");
return;
}
-#endif /* SERGEEV */
+#else
+ if (game.damage[DSRSENS] != 0.0) return;
+ if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
prout("Spock- \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
skip(1);
prout(" Planet at %s is of class %s.",
prout("Spock- \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
skip(1);
prout(" Planet at %s is of class %s.",
@@
-110,7
+107,6
@@
void sensor(void) {
if (game.state.plnets[iplnet].crystals == 0) proutn(" no");
prout(" dilithium crystals present.\"");
if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;
if (game.state.plnets[iplnet].crystals == 0) proutn(" no");
prout(" dilithium crystals present.\"");
if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;
-#ifdef SERGEEV
}
#endif /* SERGEEV */
}
}
#endif /* SERGEEV */
}
@@
-176,9
+172,7
@@
void beam(void) {
skip(1);
prout("Kirk- \"Energize.\"");
}
skip(1);
prout("Kirk- \"Energize.\"");
}
-#ifdef SERGEEV
ididit=1;
ididit=1;
-#endif /* SERGEEV */
skip(1);
prouts("WWHOOOIIIIIRRRRREEEE.E.E. . . . . . .");
skip(2);
skip(1);
prouts("WWHOOOIIIIIRRRRREEEE.E.E. . . . . . .");
skip(2);
@@
-230,9
+224,7
@@
void mine(void) {
if (consumeTime()) return;
prout("Mining operation complete.");
imine = 1;
if (consumeTime()) return;
prout("Mining operation complete.");
imine = 1;
-#ifdef SERGEEV
ididit=1;
ididit=1;
-#endif /* SERGEEV */
}
void usecrystals(void) {
}
void usecrystals(void) {
@@
-282,9
+274,7
@@
void usecrystals(void) {
prout(" are going crazy, but I think it's");
prout(" going to work!! Congratulations, Sir!\"");
cryprob *= 2.0;
prout(" are going crazy, but I think it's");
prout(" going to work!! Congratulations, Sir!\"");
cryprob *= 2.0;
-#ifdef SERGEEV
ididit=1;
ididit=1;
-#endif /* SERGEEV */
}
void shuttle(void) {
}
void shuttle(void) {