From 86f17194d065df99c2079102072cdcb1cfbc2339 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 15 Sep 2006 22:47:09 +0000 Subject: [PATCH] Make inhabited worlds display as '@'. Document this. Turn off generation of inhabited worlds in plain and almy versions. --- ChangeLog | 23 +++++++++++++++++++++++ doc/sst-doc.xml | 18 ++++++++++-------- src/setup.c | 9 ++++++--- src/sst.h | 1 + 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f4ebf0..7f13076 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2006-09-15 Eric S. Raymond + + * TODO: Fixed these bug items from the TO-DO list: + + * Bring the online help in sync with our commands changes + + * Find out why the online help contains the escape sequences like + ~@~T (Eric?) + + The first was due to bugs in some macro definitions in sst.c, now + fixed. The second was from escape sequences generated into + sst.doc by xmlto for left-and right-quotes, dashes, and no-break + spaces; that is fixed by an additional translation step in + makehelp.py. + + xmlto still generates line-drawing characters for the tables in + the LRSCAN and REPORT help items, but those look OK on an xterm in + text mode and their help items are suppressed (along with their + commands) in curses mode. + + This is not a completely satisfactory solution, but it will do + until a design change makes those help items visible again. + 2006-09-12 gettextize * Makefile.am (SUBDIRS): Add po. diff --git a/doc/sst-doc.xml b/doc/sst-doc.xml index 268d8c1..a57278d 100644 --- a/doc/sst-doc.xml +++ b/doc/sst-doc.xml @@ -253,13 +253,14 @@ The Emeritus game is strictly for masochists. The fourth question, new in SST2K, sets your game options. A blank answer or 'fancy' enables all SST2K features. The option -'plain' disables a number of features (Tholians, planets & -dilithium, Thingies shooting back, deep-space-probes, Klingon ramming -and movement, time-warping through black holes, death-ray upgrade), -approximating the original CDC 6600 FORTRAN game from UT Austin. The -option 'almy' approximates Tom Almy's C translation from 1979, -disabling Thingies shooting back, base shields, and time-warping -through black holes. +'plain' approximated the original CDC 6600 FORTRAN game from UT Austin +and disables a number of features: Tholians, planets & dilithium, +Thingies shooting back, deep-space-probes, Klingon ramming and +movement, time-warping through black holes, death-ray +upgrade. inhabited worlds. The option 'almy' approximates Tom Almy's +C translation from 1979, disabling Thingies shooting back, base +shields, time-warping through black holes, and inhabited +worlds. How To Issue Commands @@ -387,7 +388,8 @@ described by an example. There are ordinary Klingons (K) at sectors 5 - 8 and 6 - 2, and a Klingon Commander (C) at 9 - 9. The (GULP) Super-commander (S) is occupies sector 4 - 4, and a -Romulan (R) is at 1 - 6. A planet (P) is at sector 7 - 6. There are +Romulan (R) is at 1 - 6. An uninhabited planet (P) is at sector 7 - 6 +(if it were inhabited, it would display as a '@'). There are also a large number of stars (*). The periods (.) are just empty space—they are printed to help you get your bearings. Sector 6 - 4 contains a black hole ( ). diff --git a/src/setup.c b/src/setup.c index ed97fd8..b93859c 100644 --- a/src/setup.c +++ b/src/setup.c @@ -479,12 +479,12 @@ int choose(int needprompt) } 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_THINGY | OPTION_BLKHOLE | OPTION_BASE); + game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS); 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; - 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(); diff --git a/src/sst.h b/src/sst.h index 321d802..0683235 100644 --- a/src/sst.h +++ b/src/sst.h @@ -285,6 +285,7 @@ enum loctype {neither, quadrant, sector}; #define IHS 'S' #define IHSTAR '*' #define IHP 'P' +#define IHW '@' #define IHB 'B' #define IHBLANK ' ' #define IHDOT '.' -- 2.31.1