From f056bdb4292635bfcf8eb2ee84996da4e60690ca Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 17 Oct 2015 13:15:46 +0300 Subject: [PATCH] Comment typofixes, pt 2 --- include/color.h | 2 +- include/dungeon.h | 2 +- include/macpopup.h | 2 +- include/mextra.h | 2 +- include/objclass.h | 2 +- include/tradstdc.h | 2 +- src/attrib.c | 2 +- src/botl.c | 2 +- src/cmd.c | 4 ++-- src/dokick.c | 2 +- src/dungeon.c | 6 +++--- src/eat.c | 2 +- src/engrave.c | 2 +- src/invent.c | 2 +- src/objnam.c | 2 +- src/options.c | 2 +- src/quest.c | 2 +- src/read.c | 2 +- src/weapon.c | 2 +- src/zap.c | 2 +- win/gnome/gnbind.h | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/color.h b/include/color.h index 6ad75e221..b05ae6d73 100644 --- a/include/color.h +++ b/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. */ diff --git a/include/dungeon.h b/include/dungeon.h index c039814a5..df6a2c8da 100644 --- a/include/dungeon.h +++ b/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). */ diff --git a/include/macpopup.h b/include/macpopup.h index 1e99c664a..491592b1f 100644 --- a/include/macpopup.h +++ b/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 diff --git a/include/mextra.h b/include/mextra.h index 0fc1df1e1..e2cde882c 100644 --- a/include/mextra.h +++ b/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 */ diff --git a/include/objclass.h b/include/objclass.h index 28e65388a..f2db33c99 100644 --- a/include/objclass.h +++ b/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 */ diff --git a/include/tradstdc.h b/include/tradstdc.h index 23e04e16c..36ce4b9de 100644 --- a/include/tradstdc.h +++ b/include/tradstdc.h @@ -51,7 +51,7 @@ */ /* #define USE_VARARGS */ /* use instead of */ -/* #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 diff --git a/src/attrib.c b/src/attrib.c index 1f0277776..59d9155d2 100644 --- a/src/attrib.c +++ b/src/attrib.c @@ -414,7 +414,7 @@ exerper() break; } - /* Encumberance Checks */ + /* Encumbrance Checks */ debugpline0("exerper: Encumber checks"); switch (near_capacity()) { case MOD_ENCUMBER: diff --git a/src/botl.c b/src/botl.c index 0e0f565f9..baa6bdcf7 100644 --- a/src/botl.c +++ b/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) diff --git a/src/cmd.c b/src/cmd.c index 135946850..066e4baf7 100644 --- a/src/cmd.c +++ b/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 diff --git a/src/dokick.c b/src/dokick.c index 729c824e8..90818add3 100644 --- a/src/dokick.c +++ b/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); diff --git a/src/dungeon.c b/src/dungeon.c index abfa7bd0b..a1539a13e 100644 --- a/src/dungeon.c +++ b/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))) diff --git a/src/eat.c b/src/eat.c index 2a07830f2..d7f0e747f 100644 --- a/src/eat.c +++ b/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 */ diff --git a/src/engrave.c b/src/engrave.c index 6b843545d..f36c49105 100644 --- a/src/engrave.c +++ b/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."; diff --git a/src/invent.c b/src/invent.c index 0c430ee00..e4a9cca6a 100644 --- a/src/invent.c +++ b/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() { diff --git a/src/objnam.c b/src/objnam.c index 41bb4f8e1..b973a9805 100644 --- a/src/objnam.c +++ b/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) diff --git a/src/options.c b/src/options.c index 448b07b24..45b2856e3 100644 --- a/src/options.c +++ b/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: diff --git a/src/quest.c b/src/quest.c index cefcd639e..f01ca0422 100644 --- a/src/quest.c +++ b/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. diff --git a/src/read.c b/src/read.c index 92e34c24c..b652db9a1 100644 --- a/src/read.c +++ b/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)); diff --git a/src/weapon.c b/src/weapon.c index 9e77e5a2a..eb0e0b67c 100644 --- a/src/weapon.c +++ b/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 diff --git a/src/zap.c b/src/zap.c index b507b0589..3c6230717 100644 --- a/src/zap.c +++ b/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; diff --git a/win/gnome/gnbind.h b/win/gnome/gnbind.h index a6b669278..a4e6b9139 100644 --- a/win/gnome/gnbind.h +++ b/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);