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