projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull SERGEEV dependencies out of reports.c.
[super-star-trek.git]
/
planets.c
diff --git
a/planets.c
b/planets.c
index 01e14b78f9c0bfae0a0815f38f63d61a5a1e814d..5ed87df431216c5bc03e90e79c361fd5115c15b2 100644
(file)
--- a/
planets.c
+++ b/
planets.c
@@
-82,10
+82,7
@@
void orbit(void) {
}
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) {
@@
-96,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.",
@@
-108,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 */
}