From: Chris Bracken Date: Mon, 24 Jun 2019 00:05:01 +0000 (-0700) Subject: Fix a few typos in docs/comments/strings X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=9854fb79ce999cb485be992d85c6f245464174d6;p=liskon_frotz.git Fix a few typos in docs/comments/strings Fixes a few minor typos revealed by running a spell-checker [1] over the repo. It also identified 'auxilary' -> 'auxiliary', but it's consistently spelled throughout the code and this patch is limited to changes to docs, comments, and string literals. [1] https://github.com/client9/misspell --- diff --git a/BUGS b/BUGS index 365dade..9cf1747 100644 --- a/BUGS +++ b/BUGS @@ -33,7 +33,7 @@ Bug-testing Programs || ======================= Unix Frotz now comes with crashme, TerpEtude, gntests, strictz, and -Unicode Test. These are intended to excercise the interpreter and +Unicode Test. These are intended to exercise the interpreter and verify that it is functioning according to spec. You will find these programs in the src/test/ directory. @@ -70,7 +70,7 @@ assumed to trade saves across platforms. Arrow Key Handling || ===================== -Not really a bug, but an idiosyncracy. In "Journey", sometimes you can't +Not really a bug, but an idiosyncrasy. In "Journey", sometimes you can't use the right-arrow key to move from the "party commands" menu to the "individual commands" menu. IMHO, this is a bit sloppy, but it isn't Frotz's fault. Instead, use the spacebar to jump from menu to menu. diff --git a/ChangeLog b/ChangeLog index 8e72986..27fcb79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,7 +152,7 @@ NEW FEATURES BUG FIXES AND MINOR ENHANCEMENTS -- In BUGS, an idiosyncracy of "Journey" by Infocom was mistakenly +- In BUGS, an idiosyncrasy of "Journey" by Infocom was mistakenly identified as a bug in Frotz. (Reported by someone whom I forget) @@ -246,5 +246,5 @@ NEW FEATURES - Faster undo functionality (borrowed from Nitfol). -- History searchs has been added. Type the beginning of a past command +- History searches have been added. Type the beginning of a past command and hit the up or down arrow key. diff --git a/HOW_TO_PLAY b/HOW_TO_PLAY index a1a6e71..ee24691 100644 --- a/HOW_TO_PLAY +++ b/HOW_TO_PLAY @@ -87,7 +87,7 @@ the word "AND" or by a comma. Here are some examples: You can include several inputs on one line if you separate them by the word "THEN" or by a period. Each input will be handled in order, as -though you had typed them individually at seperate prompts. For example, +though you had typed them individually at separate prompts. For example, you could type all of the following at once, before pressing the ENTER (or RETURN) key: diff --git a/doc/dfrotz.6 b/doc/dfrotz.6 index 51218e6..d401bb8 100644 --- a/doc/dfrotz.6 +++ b/doc/dfrotz.6 @@ -154,7 +154,7 @@ special circumstances. .TP .B \-x Expand the abbreviations "g", "x", and "z" to "again", "examine", and -"wait". This switch is for use iwth old Infocom games that lack these +"wait". This switch is for use with old Infocom games that lack these common abbreviations which were introduced in later games. Use it with caution: A few games might use "g", "x" or "z" for different purposes. diff --git a/src/common/err.c b/src/common/err.c index 296e602..f630d3b 100644 --- a/src/common/err.c +++ b/src/common/err.c @@ -125,7 +125,7 @@ void runtime_error (int errnum) if (f_setup.err_report_mode == ERR_REPORT_ONCE) { print_string (" (will ignore further occurrences)"); } else { - print_string (" (occurence "); + print_string (" (occurrence "); print_long (error_count[errnum - 1], 10); print_char (')'); } diff --git a/src/common/math.c b/src/common/math.c index fdc7cad..2d087a8 100644 --- a/src/common/math.c +++ b/src/common/math.c @@ -218,7 +218,7 @@ void z_or (void) /* - * z_sub, 16bit substraction. + * z_sub, 16bit subtraction. * * zargs[0] = first value * zargs[1] = second value diff --git a/src/common/screen.c b/src/common/screen.c index 0e1e118..51a6473 100644 --- a/src/common/screen.c +++ b/src/common/screen.c @@ -802,7 +802,7 @@ void restart_screen (void) /* * validate_click * - * Return false if the last mouse click occured outside the current + * Return false if the last mouse click occurred outside the current * mouse window; otherwise write the mouse arrow coordinates to the * memory of the header extension table and return true. * diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c index c9aafc7..9c85027 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -54,7 +54,7 @@ static int isblorb(FILE *); * ux_blorb_init * * Check if we're opening a Blorb file directly. If not, check - * to see if there's a seperate Blorb file that looks like it goes + * to see if there's a separate Blorb file that looks like it goes * along with this Zcode file. If we have a Blorb file one way or the * other, make a Blorb map. If we opened a Blorb file directly, that * means that our executable is in that file and therefore we will look @@ -77,7 +77,7 @@ bb_err_t ux_blorb_init(char *filename) return bb_err_Read; /* Is this really a Blorb file? If not, maybe we're loading a naked - * zcode file and our resources are in a seperate blorb file. + * zcode file and our resources are in a separate blorb file. */ if (isblorb(fp)) { /* Now we know to look */ f_setup.exec_in_blorb = 1; /* for zcode in the blorb */ @@ -110,7 +110,7 @@ bb_err_t ux_blorb_init(char *filename) } /* At this point we know that we're using a naked zcode file */ - /* with resources in a seperate Blorb file. */ + /* with resources in a separate Blorb file. */ blorb_fp = fp; f_setup.use_blorb = 1; } diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index b60b1ec..5e09769 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -1053,7 +1053,7 @@ static int geterrmode(char *value) /* * sigwinch_handler * - * Called whenever Frotz recieves a SIGWINCH signal to make curses + * Called whenever Frotz receives a SIGWINCH signal to make curses * cleanly resize the window. To be safe, just set a flag here. * It is checked and cleared in unix_read_char. * diff --git a/src/dumb/dumb_blorb.c b/src/dumb/dumb_blorb.c index ff3795d..1cf77bc 100644 --- a/src/dumb/dumb_blorb.c +++ b/src/dumb/dumb_blorb.c @@ -50,7 +50,7 @@ static int isblorb(FILE *); * dumb_blorb_init * * Check if we're opening a Blorb file directly. If not, check - * to see if there's a seperate Blorb file that looks like it goes + * to see if there's a separate Blorb file that looks like it goes * along with this Zcode file. If we have a Blorb file one way or the * other, make a Blorb map. If we opened a Blorb file directly, that * means that our executable is in that file and therefore we will look @@ -73,7 +73,7 @@ bb_err_t dumb_blorb_init(char *filename) return bb_err_Read; /* Is this really a Blorb file? If not, maybe we're loading a naked - * zcode file and our resources are in a seperate blorb file. + * zcode file and our resources are in a separate blorb file. */ if (isblorb(fp)) { /* Now we know to look */ f_setup.exec_in_blorb = 1; /* for zcode in the blorb */ @@ -107,7 +107,7 @@ bb_err_t dumb_blorb_init(char *filename) return bb_err_NoBlorb; /* At this point we know that we're using a naked zcode file */ - /* with resources in a seperate Blorb file. */ + /* with resources in a separate Blorb file. */ f_setup.use_blorb = 1; } diff --git a/src/sdl/generic.c b/src/sdl/generic.c index 148eec9..8d0ef19 100644 --- a/src/sdl/generic.c +++ b/src/sdl/generic.c @@ -50,7 +50,7 @@ static int isblorb(FILE *fp) * gen_blorb_init * * Check if we're opening a Blorb file directly. If not, check - * to see if there's a seperate Blorb file that looks like it goes + * to see if there's a separate Blorb file that looks like it goes * along with this Zcode file. If we have a Blorb file one way or the * other, make a Blorb map. If we opened a Blorb file directly, that * means that our executable is in that file and therefore we will look @@ -73,7 +73,7 @@ bb_err_t gen_blorb_init(char *filename) return bb_err_Read; /* Is this really a Blorb file? If not, maybe we're loading a naked - * zcode file and our resources are in a seperate blorb file. + * zcode file and our resources are in a separate blorb file. */ if (isblorb(fp)) { /* Now we know to look */ f_setup.exec_in_blorb = 1; /* for zcode in the blorb */ @@ -106,7 +106,7 @@ bb_err_t gen_blorb_init(char *filename) } /* At this point we know that we're using a naked zcode file */ - /* with resources in a seperate Blorb file. */ + /* with resources in a separate Blorb file. */ blorb_fp = fp; f_setup.use_blorb = 1; } diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c index d10782a..8c73aa9 100644 --- a/src/sdl/sf_video.c +++ b/src/sdl/sf_video.c @@ -503,7 +503,7 @@ void os_draw_picture(int picture, int y, int x) ew = m_gfxScale*pic->width; eh = m_gfxScale*pic->height; - // this takes care of the fact taht x, y are really 16 bit values + // this takes care of the fact that x, y are really 16 bit values if (x & 0x8000) x |= 0xffff0000; if (y & 0x8000) y |= 0xffff0000; diff --git a/src/test/README b/src/test/README index d58dc96..09b66bf 100644 --- a/src/test/README +++ b/src/test/README @@ -1,4 +1,4 @@ -These programs are intended to excercise the interpreter that it is +These programs are intended to exercise the interpreter that it is functioning according to spec. As far as I can determine, the programs are in the public domain or made freely available with no restrictions. Copyrights are retained by the original authors where noted. diff --git a/src/test/etude/accents.inc b/src/test/etude/accents.inc index 4233b70..17601e3 100644 --- a/src/test/etude/accents.inc +++ b/src/test/etude/accents.inc @@ -92,7 +92,7 @@ Array AccentList table [; like '>>' and '<<'). The Z-Spec says that the character '>>' is code 162, and '<<' is 163. However, Inform 6.11 (following the Z-Spec 0.2) compiles - '@@64>>' as 163, and '@@64<<' as 162. The concensus is that the + '@@64>>' as 163, and '@@64<<' as 162. The consensus is that the Z-Spec 0.2 and Inform 6.11 are wrong, and Z-Spec 0.99 and later are correct.^^"; diff --git a/src/test/etude/timedstr.inc b/src/test/etude/timedstr.inc index 5ef3c7e..358c980 100644 --- a/src/test/etude/timedstr.inc +++ b/src/test/etude/timedstr.inc @@ -18,7 +18,7 @@ of text will appear. (If the lines appear at the rate of one every thirty seconds, your interpreter is using the incorrect timing rate caused by an old bug in ZIP.)^^"; - print "Interrupts actually are occuring once per second; every + print "Interrupts actually are occurring once per second; every third interrupt prints a line of text, and the other two have no visible effect. After each line, your input should be redrawn so that you can continue typing and editing it.^^";