Comment typofixes, pt 2

include/color.h

@@ -7,7 +7,7 @@
 
 /*
  * The color scheme used is tailored for an IBM PC.  It consists of the
- * standard 8 colors, folowed by their bright counterparts.  There are
+ * standard 8 colors, followed by their bright counterparts.  There are
  * exceptions, these are listed below.	Bright black doesn't mean very
  * much, so it is used as the "default" foreground color of the screen.
  */

include/dungeon.h

@@ -180,7 +180,7 @@ struct linfo {
  * To be consistent, one can assume that this map is in the player's mind and
  * has no physical correspondence (eliminating illiteracy/blind/hands/hands
  * free
- * concerns.) Therefore, this map is not exaustive nor detailed ("some
+ * concerns.) Therefore, this map is not exhaustive nor detailed ("some
  * fountains").
  * This makes it also subject to player conditions (amnesia).
  */

include/macpopup.h

@@ -1,5 +1,5 @@
 /* NetHack 3.6	macpopup.h	$NHDT-Date: 1432512781 2015/05/25 00:13:01 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */
-/* Copyright (c) Nethack Develpment Team, 1999.		*/
+/* Copyright (c) Nethack Development Team, 1999.		*/
 /* NetHack may be freely redistributed.  See license for details. */
 
 #ifndef MACPOPUP_H

include/mextra.h

@@ -157,7 +157,7 @@ struct emin {
 
 struct edog {
     long droptime;            /* moment dog dropped object */
-    unsigned dropdist;        /* dist of drpped obj from @ */
+    unsigned dropdist;        /* dist of dropped obj from @ */
     int apport;               /* amount of training */
     long whistletime;         /* last time he whistled */
     long hungrytime;          /* will get hungry at this time */

include/objclass.h

@@ -13,7 +13,7 @@ struct objclass {
     char *oc_uname;     /* called by user */
     Bitfield(oc_name_known, 1);
     Bitfield(oc_merge, 1);      /* merge otherwise equal objects */
-    Bitfield(oc_uses_known, 1); /* obj->known affects full decription */
+    Bitfield(oc_uses_known, 1); /* obj->known affects full description */
                                 /* otherwise, obj->dknown and obj->bknown */
                                 /* tell all, and obj->known should always */
                                 /* be set for proper merging behavior */

include/tradstdc.h

@@ -51,7 +51,7 @@
  */
 
 /* #define USE_VARARGS */ /* use <varargs.h> instead of <stdarg.h> */
-/* #define USE_OLDARGS */ /* don't use any variable argument facilites */
+/* #define USE_OLDARGS */ /* don't use any variable argument facilities */
 
 #if defined(apollo) /* Apollos have stdarg(3) but not stdarg.h */
 #define USE_VARARGS

src/attrib.c

@@ -414,7 +414,7 @@ exerper()
             break;
         }
 
-        /* Encumberance Checks */
+        /* Encumbrance Checks */
         debugpline0("exerper: Encumber checks");
         switch (near_capacity()) {
         case MOD_ENCUMBER:

src/botl.c

@@ -610,7 +610,7 @@ bot()
      * if that isn't done, since it sets context.botlx when a menu or
      * text display obliterates the status line.
      *
-     * To work around it, we call status_update() with ficticious
+     * To work around it, we call status_update() with fictitious
      * index of BL_FLUSH (-1).
      */
     if (context.botlx && !updated)

src/cmd.c

@@ -1333,7 +1333,7 @@ int final; /* ENL_GAMEINPROGRESS:0, ENL_GAMEOVERALIVE, ENL_GAMEOVERDEAD */
 
     Strcpy(tmpbuf, plname);
     *tmpbuf = highc(*tmpbuf); /* same adjustment as bottom line */
-    /* as in background_enlighenment, when poly'd we need to use the saved
+    /* as in background_enlightenment, when poly'd we need to use the saved
        gender in u.mfemale rather than the current you-as-monster gender */
     Sprintf(buf, "%s the %s's attributes:", tmpbuf,
             ((Upolyd ? u.mfemale : flags.female) && urole.name.f)
@@ -1696,7 +1696,7 @@ int final;
         Sprintf(buf, "%s blind",
                 !haseyes(youmonst.data) ? "innately"
                 : u.uroleplay.blind ? "permanently"
-                  /* better phrasing desparately wanted... */
+                  /* better phrasing desperately wanted... */
                   : Blindfolded_only ? "deliberately"
                     : "temporarily");
         if (wizard && (Blinded & TIMEOUT) != 0L

src/dokick.c

@@ -869,7 +869,7 @@ dokick()
     mtmp = isok(x, y) ? m_at(x, y) : 0;
     /* might not kick monster if it is hidden and becomes revealed,
        if it is peaceful and player declines to attack, or if the
-       hero passes out due to enbumbrance with low hp; context.move
+       hero passes out due to encumbrance with low hp; context.move
        will be 1 unless player declines to kick peaceful monster */
     if (mtmp) {
         oldglyph = glyph_at(x, y);

src/dungeon.c

@@ -578,7 +578,7 @@ struct proto_dungeon *pd;
     for (i = 0; i <= MAXLEVEL; i++)
         map[i] = FALSE;
 
-    /* get base and range and set those entried to true */
+    /* get base and range and set those entries to true */
     count = level_range(lev->dlevel.dnum, pd->tmplevel[idx].lev.base,
                         pd->tmplevel[idx].lev.rand, pd->tmplevel[idx].chain,
                         pd, &start);
@@ -627,7 +627,7 @@ int d;
  * template.  Next pick one.  Then try to place the next level.  If
  * sucessful, we're done.  Otherwise, try another (and another) until
  * all possible places have been tried.  If all possible places have
- * been exausted, return false.
+ * been exhausted, return false.
  */
 STATIC_OVL boolean
 place_level(proto_index, pd)
@@ -2210,7 +2210,7 @@ recalc_mapseen()
     /* Should not happen in general, but possible if in the process
      * of being booted from the quest.  The mapseen object gets
      * removed during the expulsion but prior to leaving the level
-     * [Since quest explusion no longer deletes quest mapseen data,
+     * [Since quest expulsion no longer deletes quest mapseen data,
      * null return from find_mapseen() should now be impossible.]
      */
     if (!(mptr = find_mapseen(&u.uz)))

src/eat.c

@@ -2290,7 +2290,7 @@ struct obj *otmp;
     return 0;
 }
 
-int doeat() /* generic "eat" command funtion (see cmd.c) */
+int doeat() /* generic "eat" command function (see cmd.c) */
 {
     struct obj *otmp;
     int basenutrit; /* nutrition of full item */

src/engrave.c

@@ -1118,7 +1118,7 @@ doengrave()
             } else if (len > 1)
                 otmp->spe -= len >> 1;
             else
-                otmp->spe -= 1; /* Prevent infinite grafitti */
+                otmp->spe -= 1; /* Prevent infinite graffiti */
         }
         if (multi)
             nomovemsg = "You finish defacing the dungeon.";

src/invent.c

@@ -2808,7 +2808,7 @@ boolean picked_some;
     return (!!Blind);
 }
 
-/* explicilty look at what is here, including all objects */
+/* explicitly look at what is here, including all objects */
 int
 dolook()
 {

src/objnam.c

@@ -1832,7 +1832,7 @@ static const char *const as_is[] = {
        variant instead of attempting to support both. */
 };
 
-/* singularize/pluralize decisiions common to both makesingular & makeplural
+/* singularize/pluralize decisions common to both makesingular & makeplural
  */
 STATIC_OVL boolean
 singplur_lookup(basestr, endstring, to_plural, alt_as_is)

src/options.c

@@ -2665,7 +2665,7 @@ boolean tinitial, tfrom_file;
     /* things to disclose at end of game */
     if (match_optname(opts, "disclose", 7, TRUE)) {
         /*
-         * The order that the end_disclore options are stored:
+         * The order that the end_disclose options are stored:
          *	inventory, attribs, vanquished, genocided,
          *	conduct, overview.
          * There is an array in flags:

src/quest.c

@@ -158,7 +158,7 @@ boolean talk;
 }
 
 /*
- * Expell the player to the stairs on the parent of the quest dungeon.
+ * Expel the player to the stairs on the parent of the quest dungeon.
  *
  * This assumes that the hero is currently _in_ the quest dungeon and that
  * there is a single branch to and from it.

src/read.c

@@ -837,7 +837,7 @@ int howmuch;
     if (!rn2(3))
         forget_levels(rn2(25));
 
-    /* 1 in 3 chance of forgeting some objects */
+    /* 1 in 3 chance of forgetting some objects */
     if (!rn2(3))
         forget_objects(rn2(25));
 

src/weapon.c

@@ -337,7 +337,7 @@ struct monst *mon;
     }
 
     if (tmp > 0) {
-        /* It's debateable whether a rusted blunt instrument
+        /* It's debatable whether a rusted blunt instrument
            should do less damage than a pristine one, since
            it will hit with essentially the same impact, but
            there ought to some penalty for using damaged gear

src/zap.c

@@ -952,7 +952,7 @@ register struct obj *obj;
         || (otyp == POT_WATER && (obj->blessed || obj->cursed))) {
         if (obj->spe != ((obj->oclass == WAND_CLASS) ? -1 : 0)
             && otyp != WAN_CANCELLATION && /* can't cancel cancellation */
-            otyp != MAGIC_LAMP && /* cancelling doesn't remove djini */
+            otyp != MAGIC_LAMP && /* cancelling doesn't remove djinni */
             otyp != CANDELABRUM_OF_INVOCATION) {
             costly_alteration(obj, COST_CANCEL);
             obj->spe = (obj->oclass == WAND_CLASS) ? -1 : 0;

win/gnome/gnbind.h

@@ -65,7 +65,7 @@ void gnome_mark_synch(void);
 void gnome_wait_synch(void);
 void gnome_cliparound(int x, int y);
 /* The following function does the right thing.  The nethack
- * gnome_cliparound (which lacks the winid) simply calls this funtion.
+ * gnome_cliparound (which lacks the winid) simply calls this function.
 */
 void gnome_cliparound_proper(winid wid, int x, int y);
 void gnome_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph);