Code, comment, and documentation typo fixes.
authorEric S. Raymond <esr@thyrsus.com>
Sun, 31 Oct 2004 15:30:51 +0000 (15:30 +0000)
committerEric S. Raymond <esr@thyrsus.com>
Sun, 31 Oct 2004 15:30:51 +0000 (15:30 +0000)
ai.c
battle.c
events.c
moving.c
planets.c
setup.c
sst.c
sst.doc
sst.h

diff --git a/ai.c b/ai.c
index de54e7bac1b069560a3ac2c37fb7d2164851d3ca..8f4bb988e56eeece0d3c964b7902b66d8deb1094 100644 (file)
--- a/ai.c
+++ b/ai.c
@@ -550,7 +550,7 @@ void scom(int *ipage) {
 \r
 void movetho(void) {\r
        int idx, idy, im, i, dum, my;\r
-       /* Move the Tholean */\r
+       /* Move the Tholian */\r
        if (ithere==0 || justin == 1) return;\r
 \r
        if (ithx == 1 && ithy == 1) {\r
index e9cc2f61a662b185a5abcc8ecea61a077c9a7a30..9a83fba3898309a5bc148bc2481e2c8b40f294e3 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -1,6 +1,6 @@
 #include "sst.h"\r
 \r
-void sheild(int i) {\r
+void doshield(int i) {\r
        int key;\r
        enum {NONE, SHUP, SHDN, NRG} action = NONE;\r
 \r
@@ -596,7 +596,7 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy) {
                d.nromrem--;\r
        }\r
        else if (type == IHT) {\r
-               /* Killed a Tholean */\r
+               /* Killed a Tholian */\r
                ithere = 0;\r
        }\r
        else {\r
index 192b1cb51ba8d03eec2c06c995c94c6b41327ce1..84ce49b3e5d9dc6e3a4f6f03990efe1db5b7fbf7 100644 (file)
--- a/events.c
+++ b/events.c
@@ -163,7 +163,7 @@ void events(void) {
                                }\r
                                if (shldup==0) {\r
                                        if (damage[DSHIELD]==0 && shield > 0) {\r
-                                               sheild(2); /* Shldsup */\r
+                                               doshield(2); /* Shldsup */\r
                                                shldchg=0;\r
                                        }\r
                                        else prout("(Shields not currently useable.)");\r
index fae20ff504a56d0e1d7228881181174d3e755547..47bb598448dd3ffe685a548f20495167e7aa1a83 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -8,7 +8,7 @@ void move(void) {
        int trbeam = 0, n, l, ix, iy, kink, kinks, iquad;\r
 \r
        if (inorbit) {\r
-               prout("SULU- \"Leaving standard orbit.\"");\r
+               prout("Helmsman Sulu- \"Leaving standard orbit.\"");\r
                inorbit = 0;\r
        }\r
 \r
@@ -112,7 +112,7 @@ void move(void) {
                                dist=0.1*sqrt((sectx-ix)*(double)(sectx-ix) +\r
                                                          (secty-iy)*(double)(secty-iy));\r
                                switch (iquad) {\r
-                                       case IHT: /* Ram a Tholean */\r
+                                       case IHT: /* Ram a Tholian */\r
                                        case IHK: /* Ram enemy ship */\r
                                        case IHC:\r
                                        case IHS:\r
@@ -521,7 +521,7 @@ void warp(int i) {
                        proutn("  a trip would require approximately ");\r
                        cramf(100.0*Time/d.remtime, 0, 2);\r
                        prout(" percent of our");\r
-                       prout("  remaining time.  Are you sure this is wise?\"");\r
+                       prout(" remaining time.  Are you sure this is wise?\"");\r
                        if (ja() == 0) { ididit = 0; return;}\r
                }\r
        }\r
@@ -827,7 +827,7 @@ void probe(void) {
                skip(1);\r
                if (damage[DRADIO] != 0 && condit != IHDOCKED) {\r
                        prout("Spock-  \"Records show the previous probe has not yet");\r
-                       prout("   reached it's destination.\"");\r
+                       prout("   reached its destination.\"");\r
                }\r
                else\r
                        prout("Uhura- \"The previous probe is still reporting data, Sir.\"");\r
index 39e08463f944cd9b7bfe3576442a01aea9b6ed53..a816863ecb2e75b0330bd361a976c37d73d85ee6 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -294,7 +294,7 @@ void shuttle(void) {
                }\r
                else if (damage[DSHUTTL] > 0)\r
                        prout("The Galileo is damaged.");\r
-               else prout("Shuttle craft is now serving Big Mac's.");\r
+               else prout("Shuttle craft is now serving Big Macs.");\r
                return;\r
        }\r
        if (inorbit==0) {\r
@@ -323,7 +323,7 @@ void shuttle(void) {
        Time = 3.0e-5*height;\r
        if (Time >= 0.8*d.remtime) {\r
                prout("First Officer Spock-  \"Captain, I compute that such");\r
-               prout("  a maneuver would require aproximately ");\r
+               prout("  a maneuver would require approximately ");\r
                cramf(100*Time/d.remtime,0,4);\r
                prout("% of our");\r
                prout("remaining time.");\r
diff --git a/setup.c b/setup.c
index 2306cb0d05d0ab1777b51bdfa8f161000ec83c81..29bcd291ee9fb3e46bd5e4684c7d18cacfcc5015 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -634,7 +634,7 @@ void newqad(int shutup) {
                neutz = 1;\r
                if (damage[DRADIO] <= 0.0) {\r
                        skip(1);\r
-                       prout("LT. UHURA- \"Captain, an urgent message.");\r
+                       prout("LT. Uhura- \"Captain, an urgent message.");\r
                        prout("  I'll put it on audio.\"  CLICK");\r
                        skip(1);\r
                        prout("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE.");\r
diff --git a/sst.c b/sst.c
index 2c888443c27eeaf4c6b943d71442fee786e68ecb..fa24d75dbaafb779fb486f9d02e57cef79a8b3e7 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -210,7 +210,7 @@ static void makemoves(void) {
                                warp(1);\r
                                break;\r
                        case 5:                 // shields\r
-                               sheild(1);\r
+                               doshield(1);\r
                                if (ididit) {\r
                                        attack(2);\r
                                        shldchg = 0;\r
@@ -401,8 +401,8 @@ void cramen(int i) {
                case IHP: s = "Planet"; break;\r
                case IHB: s = "Starbase"; break;\r
                case IHBLANK: s = "Black hole"; break;\r
-               case IHT: s = "Tholean"; break;\r
-               case IHWEB: s = "Tholean web"; break;\r
+               case IHT: s = "Tholian"; break;\r
+               case IHWEB: s = "Tholian web"; break;\r
                default: s = "Unknown??"; break;\r
        }\r
        proutn(s);\r
diff --git a/sst.doc b/sst.doc
index afc36c34acdc3c3b9cf2cbb9f3ac09f506f745e7..1201d31bc58a74a78a950f5ad9b1dddf31cf744b 100644 (file)
--- a/sst.doc
+++ b/sst.doc
@@ -39,7 +39,7 @@
                         With Modifications By\r
                               Don Smith\r
 \r
-                            Resurected By\r
+                            Resurrected By\r
                                Tom Almy\r
                                   \r
      Permission is hereby granted for the copying, distribution,\r
@@ -221,7 +221,7 @@ supply.  You can either beam down to the planet surface using the
 transporter, or take the shuttle craft "Galileo."\r
 \r
 Finally, each quadrant will contain from zero to three black holes.\r
-These can deflect or swallor torpedoes passing near them. They also\r
+These can deflect or swallow torpedoes passing near them. They also\r
 swallow enemy ships knocked into them.  If your ship enters one - - -\r
 \f                                                                        3\r
 Star Trek is a rich game, full of detail.  These instructions are\r
@@ -649,7 +649,7 @@ It costs 50 units of energy to raise shields, nothing to lower them.
 You may move with your shields up; this costs nothing under impulse\r
 power, but doubles the energy required for warp drive.\r
 \r
-Each time you raise or lower yoru shields, the Klingons have another\r
+Each time you raise or lower your shields, the Klingons have another\r
 chance to attack.  Since shields do not raise and lower\r
 instantaneously, the hits you receive will be intermediate between\r
 what they would be if the shields were completely up or completely\r
@@ -1228,7 +1228,7 @@ effect is to freeze the game on the file 'EMSAVE.TRK' in your current
 directory, erase the screen, and exit.\r
 \r
 Of course, you do loose the chance to get a plaque when you use this\r
-manouver.\r
+maneuver.\r
 \r
 \r
  ****************\r
diff --git a/sst.h b/sst.h
index dcbb14ddd2ea732eb389c806d4eb76a842ac27ef..7c8272dd36f3b220e183631833f34d829d67075d 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -354,7 +354,7 @@ void lrscan(void);
 void phasers(void);\r
 void photon(void);\r
 void warp(int);\r
-void sheild(int);\r
+void doshield(int);\r
 void dock(void);\r
 void dreprt(void);\r
 void chart(int);\r