From f8b48490aa47bb0c50b7b73f02f4c80aad6d1a64 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 17 Oct 2015 12:28:52 +0300 Subject: [PATCH] Comment typofixes --- doc/Guidebook.tex | 2 +- include/config1.h | 2 +- include/decl.h | 2 +- include/patchlevel.h | 2 +- include/rm.h | 2 +- include/skills.h | 2 +- include/wceconf.h | 2 +- include/winX.h | 2 +- src/apply.c | 2 +- src/artifact.c | 2 +- src/bones.c | 2 +- src/botl.c | 2 +- src/cmd.c | 4 ++-- src/display.c | 2 +- src/do_name.c | 2 +- src/light.c | 4 ++-- src/makemon.c | 2 +- src/mhitm.c | 6 +++--- src/objnam.c | 2 +- src/pager.c | 4 ++-- src/pray.c | 2 +- src/timeout.c | 2 +- sys/vms/vmstty.c | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index a68ab58f8..cc8c3d310 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1,6 +1,6 @@ \documentstyle[titlepage,longtable]{article} % NetHack 3.6 Guidebook.tex $NHDT-Date: 1431192762 2015/05/09 17:32:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */ -%+% we're still limping along in LaTeX 2.09 compatability mode +%+% we're still limping along in LaTeX 2.09 compatibility mode %-%\documentclass{article} %-%\usepackage{hyperref} % before longtable %-%% if hyperref isn't available, we can get by with this instead diff --git a/include/config1.h b/include/config1.h index 33fa86c4a..e5339735f 100644 --- a/include/config1.h +++ b/include/config1.h @@ -154,7 +154,7 @@ #define _DECC_V4_SOURCE /* avoid some incompatible V5.x changes */ #endif #undef __HIDE_FORBIDDEN_NAMES /* need non-ANSI library support functions */ -#ifdef VAXC /* DEC C in VAX C compatability mode; 'signed' works */ +#ifdef VAXC /* DEC C in VAX C compatibility mode; 'signed' works */ #define signed /* but causes diagnostic about VAX C not supporting it */ #endif #else diff --git a/include/decl.h b/include/decl.h index fae4fcf4b..128413aaa 100644 --- a/include/decl.h +++ b/include/decl.h @@ -70,7 +70,7 @@ E struct dgn_topology { /* special dungeon levels for speed */ d_level d_mineend_level; d_level d_sokoend_level; } dungeon_topology; -/* macros for accesing the dungeon levels by their old names */ +/* macros for accessing the dungeon levels by their old names */ /* clang-format off */ #define oracle_level (dungeon_topology.d_oracle_level) #define bigroom_level (dungeon_topology.d_bigroom_level) diff --git a/include/patchlevel.h b/include/patchlevel.h index 741922ea6..4db87dae2 100644 --- a/include/patchlevel.h +++ b/include/patchlevel.h @@ -380,7 +380,7 @@ * Patch 2, August 16, 1989 * add support for OS/2 (courtesy Timo Hakulinen) * add a better makefile for MicroSoft C (courtesy Paul Gyugyi) - * more accomodation of compilers and preprocessors + * more accommodation of compilers and preprocessors * add better screen-size sensing * expand color use for PCs and introduce it for SVR3 UNIX machines * extend '/' to multiple identifications diff --git a/include/rm.h b/include/rm.h index c833f2dcc..5e7104898 100644 --- a/include/rm.h +++ b/include/rm.h @@ -188,7 +188,7 @@ #define S_digbeam 69 /* dig beam symbol */ #define S_flashbeam 70 /* camera flash symbol */ #define S_boomleft 71 /* thrown boomerang, open left, e.g ')' */ -#define S_boomright 72 /* thrown boomerand, open right, e.g. '(' */ +#define S_boomright 72 /* thrown boomerang, open right, e.g. '(' */ #define S_ss1 73 /* 4 magic shield glyphs */ #define S_ss2 74 #define S_ss3 75 diff --git a/include/skills.h b/include/skills.h index 4900ec758..1c174d5c3 100644 --- a/include/skills.h +++ b/include/skills.h @@ -16,7 +16,7 @@ * Order matters and are used in macros. * Positive values denote hand-to-hand weapons or launchers. * Negative values denote ammunition or missiles. - * Update weapon.c if you ammend any skills. + * Update weapon.c if you amend any skills. * Also used for oc_subtyp. */ #define P_DAGGER 1 diff --git a/include/wceconf.h b/include/wceconf.h index 4dc573325..fb9f0f60d 100644 --- a/include/wceconf.h +++ b/include/wceconf.h @@ -336,7 +336,7 @@ extern long __cdecl ftell(FILE *f); #endif /* leave - Windows CE defines leave as part of exception handling (__leave) - It confilicts with existing sources and since we don't use exceptions it is + It conflicts with existing sources and since we don't use exceptions it is safe to undefine it */ #ifdef leave diff --git a/include/winX.h b/include/winX.h index b2fba46f1..a54a37a9e 100644 --- a/include/winX.h +++ b/include/winX.h @@ -176,7 +176,7 @@ struct text_info_t { int extra_width, /* Sum of left and right border widths. */ extra_height; /* Sum of top and bottom border widths. */ boolean blocked; /* */ - boolean destroy_on_ack; /* Destroy this window when acknowleged. */ + boolean destroy_on_ack; /* Destroy this window when acknowledged. */ #ifdef GRAPHIC_TOMBSTONE boolean is_rip; /* This window needs a tombstone. */ #endif diff --git a/src/apply.c b/src/apply.c index 476c700dd..bf7f3ec66 100644 --- a/src/apply.c +++ b/src/apply.c @@ -1976,7 +1976,7 @@ long timeout; if (cansee_spot && !silent && !suppress_see) { struct monst *mon; mon = figurine->ocarry; - /* figurine carring monster might be invisible */ + /* figurine carrying monster might be invisible */ if (canseemon(figurine->ocarry)) { Sprintf(carriedby, "%s pack", s_suffix(a_monnam(mon))); } else if (is_pool(mon->mx, mon->my)) diff --git a/src/artifact.c b/src/artifact.c index e30fe2efd..fbe67a3ce 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1842,7 +1842,7 @@ int orc_count; /* new count (warn_obj_cnt is old count); -1 is a flag value */ || uwep->oartifact == ART_ORCRIST || uwep->oartifact == ART_GRIMTOOTH)) { if (orc_count == -1 && warn_obj_cnt > 0) { - /* -1 means that blindess has just been toggled; give a + /* -1 means that blindness has just been toggled; give a 'continue' message that eventual 'stop' message will match */ pline("%s is %s.", bare_artifactname(uwep), !Blind ? "glowing" : "quivering"); diff --git a/src/bones.c b/src/bones.c index 4f8589e3a..2cadc108e 100644 --- a/src/bones.c +++ b/src/bones.c @@ -72,7 +72,7 @@ boolean restore; } if (restore) { - /* artifact bookeeping needs to be done during + /* artifact bookkeeping needs to be done during restore; other fixups are done while saving */ if (otmp->oartifact) { if (exist_artifact(otmp->otyp, safe_oname(otmp)) diff --git a/src/botl.c b/src/botl.c index f6fd1d20f..0e0f565f9 100644 --- a/src/botl.c +++ b/src/botl.c @@ -476,7 +476,7 @@ bot() blstats[idx][BL_GOLD].a.a_long = money_cnt(invent); /* * The tty port needs to display the current symbol for gold - * as a field header, so to accomodate that we pass gold with + * as a field header, so to accommodate that we pass gold with * that already included. If a window port needs to use the text * gold amount without the leading "$:" the port will have to * add 2 to the value pointer it was passed in status_update() diff --git a/src/cmd.c b/src/cmd.c index 63dc9b920..135946850 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -270,7 +270,7 @@ popch() char pgetchar() -{ /* curtesy of aeb@cwi.nl */ +{ /* courtesy of aeb@cwi.nl */ register int ch; if (!(ch = popch())) @@ -1435,7 +1435,7 @@ int final; (u.ualign.type != u.ualignbase[A_ORIGINAL]) ? "now " : - /* athiest (ignored in very early game); lastly, normal case + /* atheist (ignored in very early game); lastly, normal case */ (!u.uconduct.gnostic && moves > 1000L) ? "nominally " : "", u_gname()); diff --git a/src/display.c b/src/display.c index 141a85db0..8a7fcdad2 100644 --- a/src/display.c +++ b/src/display.c @@ -1796,7 +1796,7 @@ int x, y, a, b, c, dd; * Return 'which' if position is implies an unfinshed exterior. Return * zero otherwise. Unfinished implies outer area is rock or a corridor. * - * Things that are ambigious: lava + * Things that are ambiguous: lava */ STATIC_OVL int check_pos(x, y, which) diff --git a/src/do_name.c b/src/do_name.c index 8697f39ee..ca1585398 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -763,7 +763,7 @@ namefloorobj() /* note well: 'obj' might be as instance of STRANGE_OBJECT if target is a mimic; passing that to xname (directly or via simpleonames) would yield "glorkum" so we need to handle it explicitly; it will - alwlays fail the Hallucination test and pass the !callable test, + always fail the Hallucination test and pass the !callable test, resulting in the "can't be assigned a type name" message */ Strcpy(buf, (obj->otyp != STRANGE_OBJECT) ? simpleonames(obj) diff --git a/src/light.c b/src/light.c index a02ce53c1..a0961315b 100644 --- a/src/light.c +++ b/src/light.c @@ -187,7 +187,7 @@ char **cs_rows; if (ls->x == u.ux && ls->y == u.uy) { /* * If the light source is located at the hero, then - * we can use the COULD_SEE bits already calcualted + * we can use the COULD_SEE bits already calculated * by the vision system. More importantly than * this optimization, is that it allows the vision * system to correct problems with clear_path(). @@ -502,7 +502,7 @@ struct obj *obj; || artifact_light(obj))); } -/* copy the light source(s) attachted to src, and attach it/them to dest */ +/* copy the light source(s) attached to src, and attach it/them to dest */ void obj_split_light_source(src, dest) struct obj *src, *dest; diff --git a/src/makemon.c b/src/makemon.c index 69f73429f..65e799d6c 100644 --- a/src/makemon.c +++ b/src/makemon.c @@ -1202,7 +1202,7 @@ register int mmflags; mtmp->cham = mcham; /* Note: shapechanger's initial form used to be chosen here with rndmonst(), yielding a monster - which was approriate to the level's difficulty + which was appropriate to the level's difficulty but ignored the changer's usual type selection so would be inappropriate for vampshifters. Let newcham() pick the shape. */ diff --git a/src/mhitm.c b/src/mhitm.c index 07b5ac46e..e24a9d37b 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -649,8 +649,8 @@ register struct attack *mattk; dy = mdef->my; /* * Leave the defender in the monster chain at it's current position, - * but don't leave it on the screen. Move the agressor to the def- - * ender's position. + * but don't leave it on the screen. Move the aggressor to the + * defender's position. */ remove_monster(ax, ay); place_monster(magr, dx, dy); @@ -706,7 +706,7 @@ register struct attack *mattk; result = mdamagem(magr, mdef, mattk); - /* Kill off agressor if it didn't die. */ + /* Kill off aggressor if it didn't die. */ if (!(result & MM_AGR_DIED)) { mondead(magr); if (magr->mhp > 0) diff --git a/src/objnam.c b/src/objnam.c index 07586b615..41bb4f8e1 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -1690,7 +1690,7 @@ static const char *const special_subjs[] = { /* note: "detect monsters" and "shape changers" are normally caught via "(s) of ", but they can be wished for using the shorter form, so we include them here - to accomodate usage by makesingular during wishing */ + to accommodate usage by makesingular during wishing */ }; /* return form of the verb (input plural) for present tense 3rd person subj */ diff --git a/src/pager.c b/src/pager.c index fa0ac11bc..1138c06ac 100644 --- a/src/pager.c +++ b/src/pager.c @@ -108,7 +108,7 @@ struct obj **obj_p; if (mtmp && has_mcorpsenm(mtmp)) /* mimic as corpse/statue */ otmp->corpsenm = MCORPSENM(mtmp); } - /* if located at adajcent spot, mark it as having been seen up close */ + /* if located at adjacent spot, mark it as having been seen up close */ if (otmp && distu(x, y) <= 2 && !Blind && !Hallucination) otmp->dknown = 1; @@ -808,7 +808,7 @@ coord *click_cc; win = create_nhwindow(NHW_MENU); start_menu(win); any.a_char = '/'; - /* 'y' and 'n' to keep backwards compatability with previous + /* 'y' and 'n' to keep backwards compatibility with previous versions: "Specify unknown object by cursor?" */ add_menu(win, NO_GLYPH, &any, flags.lootabc ? 0 : any.a_char, 'y', ATR_NONE, diff --git a/src/pray.c b/src/pray.c index deb046bc4..ea2d143eb 100644 --- a/src/pray.c +++ b/src/pray.c @@ -111,7 +111,7 @@ but that's really hard. #define on_shrine() ((levl[u.ux][u.uy].altarmask & AM_SHRINE) != 0) #define a_align(x, y) ((aligntyp) Amask2align(levl[x][y].altarmask & AM_MASK)) -/* criticially low hit points if hp <= 5 or hp <= maxhp/N for some N */ +/* critically low hit points if hp <= 5 or hp <= maxhp/N for some N */ boolean critically_low_hp(only_if_injured) boolean only_if_injured; /* determines whether maxhp <= 5 matters */ diff --git a/src/timeout.c b/src/timeout.c index dd0a4b9aa..7be55f7f8 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -616,7 +616,7 @@ long timeout; case OBJ_MINVENT: if (cansee_hatchspot) { - /* egg carring monster might be invisible */ + /* egg carrying monster might be invisible */ if (canseemon(egg->ocarry)) { Sprintf(carriedby, "%s pack", s_suffix(a_monnam(egg->ocarry))); diff --git a/sys/vms/vmstty.c b/sys/vms/vmstty.c index 00f419d8a..d115a8491 100644 --- a/sys/vms/vmstty.c +++ b/sys/vms/vmstty.c @@ -243,7 +243,7 @@ vms_getchar() * a stalled input connection. {For packetized environments, * cross plural(body_part(FINGER)) and hope for best. :-} * - * This is needed to preserve compatability with SMG interface + * This is needed to preserve compatibility with SMG interface * for two reasons: * 1) retain support for arrow keys, and * 2) treat other VTxxx function keys as for aborting -- 2.40.0