some comment spelling fixes

include/decl.h

@@ -96,16 +96,16 @@ struct sinfo {
     int saving;                 /* creating a save file */
     int restoring;              /* reloading a save file */
     int in_moveloop;            /* normal gameplay in progress */
-    int in_impossible;          /* reportig a warning */
+    int in_impossible;          /* reporting a warning */
     int in_docrt;               /* in docrt(): redrawing the whole screen */
-    int in_self_recover;        /* processsing orphaned level files */
+    int in_self_recover;        /* processing orphaned level files */
     int in_checkpoint;          /* saving insurance checkpoint */
     int in_parseoptions;        /* in parseoptions */
     int in_role_selection;      /* role/race/&c selection menus in progress */
     int config_error_ready;     /* config_error_add is ready, available */
     int beyond_savefile_load;   /* set when past savefile loading */
 #ifdef PANICLOG
-    int in_paniclog;            /* writing a panicloc entry */
+    int in_paniclog;            /* writing a paniclog entry */
 #endif
     int wizkit_wishing;         /* starting wizard mode game w/ WIZKIT file */
     /* getting_a_command:  only used for ALTMETA config to process ESC, but
@@ -1195,7 +1195,7 @@ struct instance_globals_m {
     struct monst *marcher; /* monster that is shooting */
 
     /* muse.c */
-    boolean m_using; /* kludge to use mondided instead of killed */
+    boolean m_using; /* kludge to use mondied instead of killed */
     struct musable m;
 
     /* options.c */

include/display.h

@@ -32,7 +32,7 @@
  * so treat those situations as blocking telepathy, detection, and warning
  * even though conceptually they shouldn't do so.
  *
- * [3.7 also] The macros whose name begins with an understore have been
+ * [3.7 also] The macros whose name begins with an underscore have been
  * converted to functions in order to have compilers generate smaller code.
  * The retained underscore versions are still used in display.c but should
  * only be used in other situations if the function calls actually produce
@@ -51,7 +51,7 @@
 
 /* organized to perform cheaper tests first;
    is_pool() vs is_pool_or_lava(): hero who is underwater can see adjacent
-   lava, but presumeably any monster there is on top so not sensed */
+   lava, but presumably any monster there is on top so not sensed */
 #define _sensemon(mon) \
     (   (!u.uswallow || (mon) == u.ustuck)                                   \
      && (!Underwater || (mdistu(mon) <= 2 && is_pool((mon)->mx, (mon)->my))) \

include/hack.h

@@ -122,7 +122,7 @@ enum cost_alteration_types {
 /* bitmask flags for corpse_xname();
    PFX_THE takes precedence over ARTICLE, NO_PFX takes precedence over both */
 #define CXN_NORMAL 0    /* no special handling */
-#define CXN_SINGULAR 1  /* override quantity if greather than 1 */
+#define CXN_SINGULAR 1  /* override quantity if greater than 1 */
 #define CXN_NO_PFX 2    /* suppress "the" from "the Unique Monst */
 #define CXN_PFX_THE 4   /* prefix with "the " (unless pname) */
 #define CXN_ARTICLE 8   /* include a/an/the prefix */
@@ -639,15 +639,15 @@ enum getobj_callback_returns {
      * floor before getobj. */
     GETOBJ_EXCLUDE_NONINVENT = -2,
     /* invalid because it is an inaccessible or unwanted piece of gear, but
-     * psuedo-valid for the purposes of allowing the player to select it and
+     * pseudo-valid for the purposes of allowing the player to select it and
      * getobj to return it if there is a prompt instead of getting "silly
      * thing", in order for the getobj caller to present a specific failure
      * message. Other than that, the only thing this does differently from
      * GETOBJ_EXCLUDE is that it inserts an "else" in "You don't have anything
      * else to foo". */
     GETOBJ_EXCLUDE_INACCESS = -1,
     /* invalid for purposes of not showing a prompt if nothing is valid but
-     * psuedo-valid for selecting - identical to GETOBJ_EXCLUDE_INACCESS but
+     * pseudo-valid for selecting - identical to GETOBJ_EXCLUDE_INACCESS but
      * without the "else" in "You don't have anything else to foo". */
     GETOBJ_EXCLUDE_SELECTABLE = 0,
     /* valid - invlet not presented in the summary or the ? menu as a

include/mondata.h

@@ -254,7 +254,7 @@
     (vegan(ptr)         \
      || ((ptr)->mlet == S_PUDDING && (ptr) != &mons[PM_BLACK_PUDDING]))
 
-/* monkeys are tameable via bananas but not pacifiable via food,
+/* monkeys are tamable via bananas but not pacifiable via food,
    otherwise their theft attack could be nullified too easily;
    dogs and cats can be tamed by anything they like to eat and are
    pacified by any other food;

include/obj.h

@@ -55,7 +55,7 @@ struct obj {
                 * oil lamp, tallow/wax candle (1 for no apparent reason?);
                 * marks spinach tins (1 iff corpsenm==NON_PM);
                 * marks tin variety (various: homemade, stir fried, &c);
-                * eggs laid by you (1), eggs upgraded with rojal jelly (2);
+                * eggs laid by you (1), eggs upgraded with royal jelly (2);
                 * Schroedinger's Box (1) or royal coffers for a court (2);
                 * named fruit index;
                 * candy bar wrapper index;
@@ -323,7 +323,7 @@ struct obj {
 #define Is_mbag(o) ((o)->otyp == BAG_OF_HOLDING || (o)->otyp == BAG_OF_TRICKS)
 #define SchroedingersBox(o) ((o)->otyp == LARGE_BOX && (o)->spe == 1)
 /* usually waterproof; random chance to be subjected to leakage if cursed;
-   excludes statues, which aren't vulernable to water even when cursed */
+   excludes statues, which aren't vulnerable to water even when cursed */
 #define Waterproof_container(o) \
     ((o)->otyp == OILSKIN_SACK || (o)->otyp == ICE_BOX || Is_box(o))
 

include/you.h

@@ -114,7 +114,7 @@ enum achivements {
      *  defeated nemesis (not same as acquiring Bell or artifact),
      *  completed quest (formally, by bringing artifact to leader),
      *  entered rogue level,
-     *  entered Fort Ludios level/branch (not guaranteed to be achieveable),
+     *  entered Fort Ludios level/branch (not guaranteed to be achievable),
      *  entered Medusa level,
      *  entered castle level,
      *  obtained castle wand (handle similarly to mines and sokoban prizes),

src/allmain.c

@@ -355,7 +355,7 @@ moveloop_core(void)
 
         gh.hero_seq++; /* moves*8 + n for n == 1..7 */
 
-        /* although we checked for encumberance above, we need to
+        /* although we checked for encumbrance above, we need to
            check again for message purposes, as the weight of
            inventory may have changed in, e.g., nh_timeout(); we do
            need two checks here so that the player gets feedback
@@ -817,7 +817,7 @@ welcome(boolean new_game) /* false => restoring an old game */
         livelog_printf(LL_ACHIEVE, "%s the%s entered the dungeon",
                        gp.plname, buf);
     } else {
-        /* if restroing in Gehennom, give same hot/smoky message as when
+        /* if restoring in Gehennom, give same hot/smoky message as when
            first entering it */
         hellish_smoke_mesg();
     }

src/apply.c

@@ -617,7 +617,7 @@ magic_whistled(struct obj *obj)
                           : ((n) <= 7) ? "several"  \
                             : "many")
         /* magic whistle is already discovered so rloc() message(s)
-           were suppressed above; if any discernible relocation occured,
+           were suppressed above; if any discernible relocation occurred,
            construct a message now and issue it below */
         if (shift > 0) {
             if (shift > 1)
@@ -1876,7 +1876,7 @@ is_valid_jump_pos(coordxy x, coordxy y, int magic, boolean showmsg)
         coordxy dx = x - u.ux, dy = y - u.uy,
                 ax = abs(dx), ay = abs(dy);
 
-        /* diag: any non-orthogonal destination classifed as diagonal */
+        /* diag: any non-orthogonal destination classified as diagonal */
         diag = (magic || Passes_walls || (!dx && !dy)) ? jAny
                : !dy ? jHorz : !dx ? jVert : jDiag;
         /* traj: flatten out the trajectory => some diagonals re-classified */

src/attrib.c

@@ -257,7 +257,7 @@ losestr(int num, const char *knam, schar k_format)
 #else
     nhUse(olduhpmax);
 #endif
-    /* 'num' chould have been reduced to 0 in the minimum strength loop;
+    /* 'num' could have been reduced to 0 in the minimum strength loop;
        '(Upolyd || !waspolyd)' is True unless damage caused rehumanization */
     if (num > 0 && (Upolyd || !waspolyd))
         (void) adjattrib(A_STR, -num, 1);

src/ball.c

@@ -714,7 +714,7 @@ drag_ball(coordxy x, coordxy y, int *bc_control,
         }
 
         /* ball is two spaces horizontal or vertical from player; move*/
-        /* chain inbetween *unless* current chain position is OK */
+        /* chain in-between *unless* current chain position is OK */
         case 4:
             if (CHAIN_IN_MIDDLE(uchain->ox, uchain->oy))
                 break;

src/botl.c

@@ -249,7 +249,7 @@ do_statusline2(void)
 void
 bot(void)
 {
-    /* dosave() flags completion by setting u.uhp to -1; supprss_map_output()
+    /* dosave() flags completion by setting u.uhp to -1; suppress_map_output()
        covers program_state.restoring and is used for status as well as map */
     if (u.uhp != -1 && gy.youmonst.data
         && iflags.status_updates && !suppress_map_output()) {
@@ -743,7 +743,7 @@ bot_via_windowport(void)
     titl = !Upolyd ? rank() : pmname(&mons[u.umonnum], Ugender);
     i = (int) (strlen(buf) + sizeof " the " + strlen(titl) - sizeof "");
     /* if "Name the Rank/monster" is too long, we truncate the name
-       but always keep at least 10 characters of it; when hitpintbar is
+       but always keep at least 10 characters of it; when hitpointbar is
        enabled, anything beyond 30 (long monster name) will be truncated */
     if (i > 30) {
         i = 30 - (int) (sizeof " the " + strlen(titl) - sizeof "");
@@ -1199,7 +1199,7 @@ eval_notify_windowport_field(int fld, boolean *valsetlist, int idx)
     /*
      * TODO:
      *  Dynamically update 'percent_matters' as rules are added or
-     *  removed to track whether any of them are precentage rules.
+     *  removed to track whether any of them are percentage rules.
      *  Then there'll be no need to assume that non-Null 'thresholds'
      *  means that percentages need to be kept up to date.
      *  [Affects exp_percent_changing() too.]
@@ -1922,7 +1922,7 @@ status_eval_next_unhilite(void)
     struct istat_s *curr;
     long next_unhilite, this_unhilite;
 
-    gb.bl_hilite_moves = gm.moves; /* simpllfied; at one point we used to try
+    gb.bl_hilite_moves = gm.moves; /* simplified; at one point we used to try
                                   * to encode fractional amounts for multiple
                                   * moves within same turn */
     /* figure out whether an unhilight needs to be performed now */

src/cmd.c

@@ -664,7 +664,7 @@ doextlist(void)
                     /* first try case-insensitive substring match */
                     && !strstri(efp->ef_txt, searchbuf)
                     && !strstri(efp->ef_desc, searchbuf)
-                    /* wildcard support; most interfaces use case-insensitve
+                    /* wildcard support; most interfaces use case-insensitive
                        pmatch rather than regexp for menu searching */
                     && !pmatchi(searchbuf, efp->ef_txt)
                     && !pmatchi(searchbuf, efp->ef_desc))
@@ -5879,7 +5879,7 @@ act_on_act(
 
     switch (act) {
     case MCMD_TRAVEL:
-        /* FIXME: player has explicilty picked "travel to this location"
+        /* FIXME: player has explicitly picked "travel to this location"
            from the menu but it will only work if flags.travelcmd is True.
            That option is intended as way to guard against stray mouse
            clicks and shouldn't inhibit explicit travel. */

src/detect.c

@@ -1427,7 +1427,7 @@ do_vicinity_map(struct obj *sobj) /* scroll--actually fake spellbook--object */
      * issuing --More-- and then regular vision update, but we want
      * to avoid that when having a clairvoyant episode every N turns
      * (from donating to a temple priest or by carrying the Amulet).
-     * Unlike when casting the spell, it is much too intrustive when
+     * Unlike when casting the spell, it is much too intrusive when
      * in the midst of walking around or combatting monsters.
      *
      * As of 3.6.2, show terrain, then object, then monster like regular
@@ -1705,7 +1705,7 @@ findit(void)
     }
     /* note: non-\0 *buf implies that at least one previous type is present */
     if (found.num_scorrs) {
-        if (*buf) /* "doors and corrs" or "doors, coors ..." */
+        if (*buf) /* "doors and corrs" or "doors, corrs ..." */
             Strcat(buf, (k == 2) ? " and " : ", ");
         if (found.num_scorrs > 1)
             Sprintf(eos(buf), "%d secret corridors", found.num_scorrs);
@@ -1714,7 +1714,7 @@ findit(void)
         num += found.num_scorrs;
     }
     if (found.num_traps) {
-        if (*buf) /* "doors, corrs, and traps" or "{doors|coors} and traps"
+        if (*buf) /* "doors, corrs, and traps" or "{doors|corrs} and traps"
                    * or "..., traps ..." */
             Strcat(buf, (k == 3 && !found.num_mons) ? ", and "
                         : (k == 2) ? " and " : ", ");

src/display.c

@@ -2447,8 +2447,8 @@ map_glyphinfo(
     }
     if (sysopt.accessibility == 1
         && (mgflags & MG_FLAG_NOOVERRIDE) && glyph_is_pet(glyph)) {
-        /* one more accessiblity kludge;
-           turn off override symbol if caller has specfieid NOOVERRIDE */
+        /* one more accessibility kludge;
+           turn off override symbol if caller has specified NOOVERRIDE */
         glyphinfo->gm.sym.symidx = mons[glyph_to_mon(glyph)].mlet + SYM_OFF_M;
     }
     glyphinfo->ttychar = gs.showsyms[glyphinfo->gm.sym.symidx];
@@ -2750,7 +2750,7 @@ reset_glyphmap(enum glyphmap_change_triggers trigger)
             gmap->sym.symidx = cmap + SYM_OFF_P;
             cmap_color(cmap);
             /*
-             *   Some speciality color mappings not hardcoded in data init
+             *   Some specialty color mappings not hardcoded in data init
              */
             if (has_rogue_color) {
                 color = cmap_to_roguecolor(cmap);
@@ -3190,7 +3190,7 @@ set_seenv(
 }
 
 /* Called by blackout(vault.c) when vault guard removes temporary corridor,
-   turning spot <x0,y0> back coordxyo stone; <x1,y1> is an adjacent spot. */
+   turning spot <x0,y0> back into stone; <x1,y1> is an adjacent spot. */
 void
 unset_seenv(
     struct rm *lev,         /* &levl[x1][y1] */
@@ -3243,7 +3243,7 @@ static const int wall_matrix[4][5] = {
  * in C_br (bottom right) terms.  All crosswalls with a single solid
  * quarter are rotated so the solid section is at the bottom right.
  * We pattern match on that, but return the correct result depending
- * on which row we'ere looking at.
+ * on which row we're looking at.
  */
 #define C_trcorn 0
 #define C_brcorn 1

src/dog.c

@@ -561,7 +561,7 @@ mon_catchup_elapsed_time(
         panic("catchup from future time?");
         /*NOTREACHED*/
         return;
-    } else if (nmv == 0L) { /* safe, but should'nt happen */
+    } else if (nmv == 0L) { /* safe, but shouldn't happen */
         impossible("catchup from now?");
     } else
 #endif
@@ -670,7 +670,7 @@ mon_leave(struct monst *mtmp)
         set_residency(mtmp, TRUE);
 
     /* if this is a long worm, handle its tail segments before mtmp itself;
-       we pass possibly trundated segment count to caller via return value  */
+       we pass possibly truncated segment count to caller via return value  */
     if (mtmp->wormno) {
         int cnt = count_wsegs(mtmp), mx = mtmp->mx, my = mtmp->my;
 
@@ -787,7 +787,7 @@ keepdogs(
             num_segs = mon_leave(mtmp);
             /* take off map and move mtmp from fmon list to mydogs */
             relmon(mtmp, &gm.mydogs); /* mtmp->mx,my retain current value */
-            mtmp->mx = mtmp->my = 0; /* mx==0 implies migating */
+            mtmp->mx = mtmp->my = 0; /* mx==0 implies migrating */
             mtmp->wormno = num_segs;
             mtmp->mlstmv = gm.moves;
         } else if (keep_mon_accessible(mtmp)) {
@@ -849,7 +849,7 @@ migrate_to_level(
     mtmp->mtrack[0].y = xyflags;
     mtmp->mux = new_lev.dnum;
     mtmp->muy = new_lev.dlevel;
-    mtmp->mx = mtmp->my = 0; /* mx==0 implies migating */
+    mtmp->mx = mtmp->my = 0; /* mx==0 implies migrating */
 
     /* don't extinguish a mobile light; it still exists but has changed
        from local (monst->mx > 0) to global (mx==0, not on this level) */
@@ -1007,7 +1007,7 @@ dogfood(struct monst *mon, struct obj *obj)
         case CARROT:
             return (herbi || mblind) ? DOGFOOD : starving ? ACCFOOD : MANFOOD;
         case BANANA:
-            /* monkeys and apes (tameable) plus sasquatch prefer these,
+            /* monkeys and apes (tamable) plus sasquatch prefer these,
                yetis will only will only eat them if starving */
             return (mptr->mlet == S_YETI && herbi) ? DOGFOOD
                    : (herbi || starving) ? ACCFOOD

src/dokick.c

@@ -347,7 +347,7 @@ ghitm(register struct monst *mtmp, register struct obj *gold)
             /* Some of these are iffy, because a hostile guard
                won't become peaceful and resume leading hero
                out of the vault.  If he did do that, player
-               could try fighting, then weasle out of being
+               could try fighting, then weasel out of being
                killed by throwing his/her gold when losing. */
             SetVoice(mtmp, 0, 80, 0);
             verbalize(umoney ? "Drop the rest and follow me."
@@ -380,7 +380,7 @@ ghitm(register struct monst *mtmp, register struct obj *gold)
                 SetVoice(mtmp, 0, 80, 0);
                 if (goldreqd)
                     verbalize("That's not enough, coward!");
-                else /* unbribeable (watchman) */
+                else /* unbribable (watchman) */
                     verbalize("I don't take bribes from scum like you!");
             } else if (was_angry) {
                 SetVoice(mtmp, 0, 80, 0);

src/dothrow.c

@@ -654,7 +654,7 @@ walk_path(coord *src_cc, coord *dest_cc,
      * This should be replaced with a more versatile algorithm
      * since it handles slanted moves in a suboptimal way.
      * Going from 'x' to 'y' needs to pass through 'z', and will
-     * fail if there's an obstable there, but it could choose to
+     * fail if there's an obstacle there, but it could choose to
      * pass through 'Z' instead if that way imposes no obstacle.
      *     ..y          .Zy
      *     xz.    vs    x..
@@ -1781,7 +1781,7 @@ return_throw_to_inv(
     struct obj *otmp = NULL;
 
     /* if 'obj' is from a stack split, we can put it back by undoing split
-       so there's no chance of merging with some other compatable stack */
+       so there's no chance of merging with some other compatible stack */
     if (obj->o_id == gc.context.objsplit.parent_oid
         || obj->o_id == gc.context.objsplit.child_oid) {
         obj->nobj = gi.invent;
@@ -1799,7 +1799,7 @@ return_throw_to_inv(
 
     /* if 'obj' wasn't from a stack split or if it wouldn't merge back
        (maybe new erosion damage?) then it needs to be added to invent;
-       don't merge with any other stack even if there is a compatable one
+       don't merge with any other stack even if there is a compatible one
        (others with similar erosion?) */
     if (!otmp) {
         obj->nomerge = 1;