projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make inhabited worlds display as '@'. Document this.
[super-star-trek.git]
/
src
/
setup.c
diff --git
a/src/setup.c
b/src/setup.c
index ed97fd8a962765d20210a49e74ee43555f280d9f..b93859ca788a2161579e3ed1fc7c5a674c349693 100644
(file)
--- a/
src/setup.c
+++ b/
src/setup.c
@@
-479,12
+479,12
@@
int choose(int needprompt)
}
if (isit("plain")) {
// Approximates the UT FORTRAN version.
}
if (isit("plain")) {
// Approximates the UT FORTRAN version.
- game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE);
+ game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE
| OPTION_WORLDS
);
game.options |= OPTION_PLAIN;
}
else if (isit("almy")) {
// Approximates Tom Almy's version.
game.options |= OPTION_PLAIN;
}
else if (isit("almy")) {
// Approximates Tom Almy's version.
- game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE);
+ game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE
| OPTION_WORLDS
);
game.options |= OPTION_ALMY;
}
else if (isit("fancy"))
game.options |= OPTION_ALMY;
}
else if (isit("fancy"))
@@
-623,7
+623,10
@@
void newqad(int shutup)
planhere = game.state.galaxy[game.quadx][game.quady].planet;
if (planhere) {
game.iplnet = planhere - game.state.plnets;
planhere = game.state.galaxy[game.quadx][game.quady].planet;
if (planhere) {
game.iplnet = planhere - game.state.plnets;
- dropin(IHP, &game.plnetx, &game.plnety);
+ if (planhere->inhabited == UNINHABITED)
+ dropin(IHP, &game.plnetx, &game.plnety);
+ else
+ dropin(IHW, &game.plnetx, &game.plnety);
}
// Check for game.condition
newcnd();
}
// Check for game.condition
newcnd();