From de79240dead2a6aff23c625925996f9a19c0f7a3 Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 16 Mar 2023 22:27:01 -0400 Subject: [PATCH] some comment spelling fixes --- include/decl.h | 8 ++++---- include/display.h | 4 ++-- include/hack.h | 6 +++--- include/mondata.h | 2 +- include/obj.h | 4 ++-- include/you.h | 2 +- src/allmain.c | 4 ++-- src/apply.c | 4 ++-- src/attrib.c | 2 +- src/ball.c | 2 +- src/botl.c | 8 ++++---- src/cmd.c | 4 ++-- src/detect.c | 6 +++--- src/display.c | 10 +++++----- src/dog.c | 10 +++++----- src/dokick.c | 4 ++-- src/dothrow.c | 6 +++--- src/eat.c | 6 +++--- src/end.c | 4 ++-- src/exper.c | 2 +- src/hack.c | 4 ++-- src/hacklib.c | 6 +++--- src/insight.c | 4 ++-- src/invent.c | 8 ++++---- src/makemon.c | 4 ++-- src/mcastu.c | 2 +- src/mdlib.c | 2 +- src/mhitm.c | 2 +- src/mhitu.c | 2 +- src/mkobj.c | 6 +++--- src/mon.c | 12 ++++++------ src/mondata.c | 2 +- src/muse.c | 2 +- src/objnam.c | 6 +++--- src/options.c | 2 +- src/pager.c | 8 ++++---- src/pickup.c | 6 +++--- src/polyself.c | 2 +- src/potion.c | 4 ++-- src/pray.c | 4 ++-- src/read.c | 6 +++--- src/rect.c | 2 +- src/rumors.c | 4 ++-- src/steed.c | 2 +- src/timeout.c | 4 ++-- src/topten.c | 2 +- src/trap.c | 6 +++--- src/uhitm.c | 6 +++--- src/worm.c | 2 +- src/worn.c | 8 ++++---- src/zap.c | 8 ++++---- 51 files changed, 118 insertions(+), 118 deletions(-) diff --git a/include/decl.h b/include/decl.h index 80b4d9d3c..acfd14982 100644 --- a/include/decl.h +++ b/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 */ diff --git a/include/display.h b/include/display.h index 80af8410c..0307f65d2 100644 --- a/include/display.h +++ b/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))) \ diff --git a/include/hack.h b/include/hack.h index 5adc1420c..b1d26d0f2 100644 --- a/include/hack.h +++ b/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,7 +639,7 @@ 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 @@ -647,7 +647,7 @@ enum getobj_callback_returns { * 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 diff --git a/include/mondata.h b/include/mondata.h index fa294eb60..c3941ec65 100644 --- a/include/mondata.h +++ b/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; diff --git a/include/obj.h b/include/obj.h index 1f15a2e46..fd5d0330a 100644 --- a/include/obj.h +++ b/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)) diff --git a/include/you.h b/include/you.h index 2c252aac1..4e17b3313 100644 --- a/include/you.h +++ b/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), diff --git a/src/allmain.c b/src/allmain.c index 5f8adb437..4793ce376 100644 --- a/src/allmain.c +++ b/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(); } diff --git a/src/apply.c b/src/apply.c index 41482b4e0..b1378b860 100644 --- a/src/apply.c +++ b/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 */ diff --git a/src/attrib.c b/src/attrib.c index 1c6889bf1..0fba34b4c 100644 --- a/src/attrib.c +++ b/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); diff --git a/src/ball.c b/src/ball.c index 252b93c99..18d6d55e8 100644 --- a/src/ball.c +++ b/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; diff --git a/src/botl.c b/src/botl.c index ab37145ad..b5bc04be6 100644 --- a/src/botl.c +++ b/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 */ diff --git a/src/cmd.c b/src/cmd.c index 1cb3757af..08fdadde1 100644 --- a/src/cmd.c +++ b/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. */ diff --git a/src/detect.c b/src/detect.c index 2d442afa1..e25a1ca2a 100644 --- a/src/detect.c +++ b/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 " : ", "); diff --git a/src/display.c b/src/display.c index aceb94876..877f9b546 100644 --- a/src/display.c +++ b/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 back coordxyo stone; is an adjacent spot. */ + turning spot back into stone; 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 diff --git a/src/dog.c b/src/dog.c index 0e8fd7f4e..46510d395 100644 --- a/src/dog.c +++ b/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 diff --git a/src/dokick.c b/src/dokick.c index 2e14cc07d..f994a32d3 100644 --- a/src/dokick.c +++ b/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); diff --git a/src/dothrow.c b/src/dothrow.c index a4d061cbd..3ec5e8b3f 100644 --- a/src/dothrow.c +++ b/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; diff --git a/src/eat.c b/src/eat.c index bed27d182..a9b021220 100644 --- a/src/eat.c +++ b/src/eat.c @@ -489,7 +489,7 @@ eatfood(void) * an acidic corpse or temporary stoning resistance to do that while * eating a cockatrice corpse. Protection is checked at the start * of the meal and having it go away mid-meal with a message about - * increased vulnerability but no consequences is too obvously wrong, + * increased vulnerability but no consequences is too obviously wrong, * but also too nit-picky to deal with. * * (Tins aren't handled by eatfood() and wouldn't need this anyway @@ -1196,7 +1196,7 @@ cpostfx(int pm) make_stunned(2L, FALSE); if ((HConfusion & TIMEOUT) > 2) make_confused(2L, FALSE); - check_intrinsics = TRUE; /* might convery temporary stoning resist */ + check_intrinsics = TRUE; /* might convey temporary stoning resist */ break; case PM_CHAMELEON: case PM_DOPPELGANGER: @@ -3574,7 +3574,7 @@ floorfood( otmp = (struct obj *) 0; } } - /* reseting 'getobj_else' here isn't essential; it will be cleared the + /* resetting 'getobj_else' here isn't essential; it will be cleared the next time it needs to be used */ getobj_else = 0; return otmp; diff --git a/src/end.c b/src/end.c index b730264a8..b6ad6c6be 100644 --- a/src/end.c +++ b/src/end.c @@ -510,13 +510,13 @@ done_in_by(struct monst *mtmp, int how) * death reason becomes "Killed by a ghoul, while paralyzed." * instead of "Killed by a ghoul, while paralyzed by a ghoul." * (3.6.x gave "Killed by a ghoul, while paralyzed by a monster." - * which is potenitally misleading when the monster is also + * which is potentially misleading when the monster is also * the killer.) * * Note that if the hero is life-saved and then killed again * before the helplessness has cleared, the second death will * report the truncated helplessness reason even if some other - * monster peforms the /coup de grace/. + * monster performs the /coup de grace/. */ if (sscanf(gm.multireasonbuf, "%u:%c", &reasonmid, &reasondummy) == 2 && mtmp->m_id == reasonmid) { diff --git a/src/exper.c b/src/exper.c index 120aa91b3..1548c98d0 100644 --- a/src/exper.c +++ b/src/exper.c @@ -250,7 +250,7 @@ losexp( strength loss or by a fire trap or by an attack by Death which all use a different minimum than life-saving or experience loss; we don't allow it to go up because that contradicts assumptions - elsewhere (such as healing wielder who drains with Strombringer) */ + elsewhere (such as healing wielder who drains with Stormbringer) */ if (u.uhpmax > olduhpmax) setuhpmax(olduhpmax); diff --git a/src/hack.c b/src/hack.c index bf5e6acc5..e7fa66225 100644 --- a/src/hack.c +++ b/src/hack.c @@ -2805,7 +2805,7 @@ pooleffects( if (Is_airlevel(&u.uz) || Is_waterlevel(&u.uz)) return FALSE; /* even if we actually end up at same location, float_down() - has already done spoteffect()'s trap and pickup actions */ + has already done trap and pickup actions of spoteffects() */ if (newspot) check_special_room(FALSE); /* spoteffects */ return TRUE; @@ -3453,7 +3453,7 @@ lookaround(void) You("stop in front of the door."); goto stop; } - /* we're orthonal to a closed door, consider it a corridor */ + /* we're orthogonal to a closed door, consider it a corridor */ goto bcorr; } else if (levl[x][y].typ == CORR) { /* corridor */ diff --git a/src/hacklib.c b/src/hacklib.c index d616cd819..32b2cc590 100644 --- a/src/hacklib.c +++ b/src/hacklib.c @@ -580,7 +580,7 @@ strsubst(char *bp, const char *orig, const char *replacement) } /* substitute the Nth occurrence of a substring within a string (in place); - if N is 0, substitute all occurrences; returns the number of subsitutions; + if N is 0, substitute all occurrences; returns the number of substitutions; maximum output length is BUFSZ (BUFSZ-1 chars + terminating '\0') */ int strNsubst( @@ -722,7 +722,7 @@ distmin(coordxy x0, coordxy y0, coordxy x1, coordxy y1) return (dx < dy) ? dy : dx; } -/* square of euclidean distance between pair of pts */ +/* square of Euclidean distance between pair of pts */ int dist2(coordxy x0, coordxy y0, coordxy x1, coordxy y1) { @@ -1330,7 +1330,7 @@ DISABLE_WARNING_FORMAT_NONLITERAL * Wrap reasons: * 1. If there are any platform issues, we have one spot to fix them - * snprintf is a routine with a troubling history of bad implementations. - * 2. Add combersome error checking in one spot. Problems with text + * 2. Add cumbersome error checking in one spot. Problems with text * wrangling do not have to be fatal. * 3. Gcc 9+ will issue a warning unless the return value is used. * Annoyingly, explicitly casting to void does not remove the error. diff --git a/src/insight.c b/src/insight.c index e3105e408..738d3b23d 100644 --- a/src/insight.c +++ b/src/insight.c @@ -1214,7 +1214,7 @@ weapon_insight(int final) int wtype; /* report being weaponless; distinguish whether gloves are worn - [perhaps mention silver ring(s) when not wearning gloves?] */ + [perhaps mention silver ring(s) when not wearing gloves?] */ if (!uwep) { you_are(empty_handed(), ""); @@ -1643,7 +1643,7 @@ attributes_enlightenment(int unused_mode UNUSED, int final) Levitation ? " if you weren't levitating" : (save_BFly == I_SPECIAL) - /* this is an oversimpliction; being trapped + /* this is an oversimplification; being trapped might also be blocking levitation so flight would still be blocked after escaping trap */ ? " if you weren't trapped" diff --git a/src/invent.c b/src/invent.c index 19d2aba29..38f44a078 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1027,7 +1027,7 @@ hold_another_object( char buf[BUFSZ]; if (!Blind) - obj->dknown = 1; /* maximize mergibility */ + obj->dknown = 1; /* maximize mergeability */ if (obj->oartifact) { /* place_object may change these */ boolean crysknife = (obj->otyp == CRYSKNIFE); @@ -2847,7 +2847,7 @@ itemactions_pushkeys(struct obj *otmp, int act) /* start with m-prefix to skip floor containers; for menustyle:Traditional when more than one floor container is present, player will get a #tip menu and - have to pick the "tip sometking being carried" choice, + have to pick the "tip something being carried" choice, then this item will be already chosen from inventory; suboptimal but possibly an acceptable tradeoff since combining item actions with use of traditional ggetobj() @@ -3397,7 +3397,7 @@ display_pickinv( /* wiz_identify stuffed the wiz_identify command character (^I) into iflags.override_ID for our use as an accelerator; it could be ambiguous if player has assigned a letter to - the #wizidentify command, so include it as a group accelator + the #wizidentify command, so include it as a group accelerator but use '_' as the primary selector */ if (unid_cnt > 1) Sprintf(eos(prompt), " (%s for all)", @@ -5566,7 +5566,7 @@ sync_perminvent(void) if ((!iflags.perm_invent && gc.core_invent_state)) { /* Odd - but this could be end-of-game disclosure - * which just sets boolean iflag.perm_invent to + * which just sets boolean iflags.perm_invent to * FALSE without actually doing anything else. */ #ifdef TTY_PERM_INVENT diff --git a/src/makemon.c b/src/makemon.c index 08b59ca2e..950f5e363 100644 --- a/src/makemon.c +++ b/src/makemon.c @@ -1778,9 +1778,9 @@ mkclass_aligned(char class, int spc, /* special mons[].geno handling */ (this used to be done in the next loop, but that didn't work well when multiple species had the same level and were followed by one that was past the bias threshold; - cited example was sucubus and incubus, where the bias + cited example was succubus and incubus, where the bias against picking the next demon resulted in incubus - being picked nearly twice as often as sucubus); + being picked nearly twice as often as succubus); we need the '+1' in case the entire set is too high level (really low gl.level hero) */ nums[last] = k + 1 - (adj_lev(&mons[last]) > (u.ulevel * 2)); diff --git a/src/mcastu.c b/src/mcastu.c index 90ae9f73d..92ed3aa09 100644 --- a/src/mcastu.c +++ b/src/mcastu.c @@ -387,7 +387,7 @@ death_inflicted_by( const char *realnm = pmname(champtr, Mgender(mtmp)), *fakenm = pmname(mptr, Mgender(mtmp)); - /* greatly simplfied extract from done_in_by(), primarily for + /* greatly simplified extract from done_in_by(), primarily for reason for death due to 'touch of death' spell; if mtmp is shape changed, it won't be a vampshifter or mimic since they can't cast spells */ diff --git a/src/mdlib.c b/src/mdlib.c index 2ab754ebc..3e8a55bed 100644 --- a/src/mdlib.c +++ b/src/mdlib.c @@ -232,7 +232,7 @@ static struct soundlib_information soundlib_opts[] = { * Use this to explicitly mask out features during version checks. * * ZEROCOMP, RLECOMP, and ZLIB_COMP describe compression features - * that the port/plaform which wrote the savefile was capable of + * that the port/platform which wrote the savefile was capable of * dealing with. Don't reject a savefile just because the port * reading the savefile doesn't match on all/some of them. * The actual compression features used to produce the savefile are diff --git a/src/mhitm.c b/src/mhitm.c index fe801b46d..c0d711dfc 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -279,7 +279,7 @@ mdisplacem(register struct monst *magr, register struct monst *mdef, * 0x0 MM_MISS * * Each successive attack has a lower probability of hitting. Some rely on - * success of previous attacks. ** this doen't seem to be implemented -dl ** + * success of previous attacks. ** this doesn't seem to be implemented -dl ** * * In the case of exploding monsters, the monster dies as well. */ diff --git a/src/mhitu.c b/src/mhitu.c index 7a12b0705..edcf9977e 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -330,7 +330,7 @@ getmattk(struct monst *magr, struct monst *mdef, attk = alt_attk_buf; /* 3.6.0 used 4d6 but since energy drain came out of max energy once current energy was gone, that tended to have a severe - effect on low energy characters; it's now 2d6 with ajustments */ + effect on low energy characters; it's now 2d6 with adjustments */ if (u.uen <= 5 * ulev && attk->damn > 1) { attk->damn -= 1; /* low energy: 2d6 -> 1d6 */ if (u.uenmax <= 2 * ulev && attk->damd > 3) diff --git a/src/mkobj.c b/src/mkobj.c index e36e34890..87f36dc15 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -947,7 +947,7 @@ mksobj(int otyp, boolean init, boolean artif) if (Is_pudding(otmp)) { otmp->globby = 1; /* for emphasis; glob quantity is always 1 and weight varies - when other globs coallesce with it or this one shrinks */ + when other globs coalesce with it or this one shrinks */ otmp->quan = 1L; /* 3.7: globs in 3.6.x left owt as 0 and let weight() fix that up during 'obj->owt = weight(obj)' below, but now @@ -1811,7 +1811,7 @@ weight(struct obj *obj) obj->quan, simpleonames(obj)); return 0; } - /* glob absorpsion means that merging globs combines their weight + /* glob absorption means that merging globs combines their weight while quantity stays 1; mksobj(), obj_absorb(), and shrink_glob() manage glob->owt and there is nothing for weight() to do except return the current value as-is */ @@ -2682,7 +2682,7 @@ hornoplenty( confers ownership of the created item to the shopkeeper */ if (horn->unpaid) addtobill(obj, FALSE, FALSE, tipping); - /* if it ended up on bill, we don't want "(unpaid, N zorkids)" + /* if it ended up on bill, we don't want "(unpaid, N zorkmids)" being included in its formatted name during next message */ iflags.suppress_price++; if (!tipping) { diff --git a/src/mon.c b/src/mon.c index a3cf91b48..26f4d6031 100644 --- a/src/mon.c +++ b/src/mon.c @@ -76,9 +76,9 @@ sanity_check_single_mon( mtmp->mnum = mndx; } #if 0 /* - * Gremlims don't obey the (mhpmax >= m_lev) rule so disable + * Gremlins don't obey the (mhpmax >= m_lev) rule so disable * this check, at least for the time being. We could skip it - * when the cloned flag is set, but the original gremlim would + * when the cloned flag is set, but the original gremlin would * still be an issue. */ /* check before DEADMONSTER() because dead monsters should still @@ -1528,7 +1528,7 @@ mon_givit(struct monst *mtmp, struct permonst *ptr) * Invisible stalker isn't flagged as conferring invisibility * so prop is 0. For hero, eating a stalker corpse confers * temporary invisibility if hero is visible. When already - * invisible, if confers permanent invisibilty and also + * invisible, if confers permanent invisibility and also * permanent see invisible. For monsters, only permanent * invisibility is possible; temporary invisibility and see * invisible aren't implemented for them. @@ -1721,7 +1721,7 @@ can_touch_safely(struct monst *mtmp, struct obj *otmp) * this will probably cause very amusing behavior with pets and gold coins. * * TODO: allow picking up 2-N objects from a pile of N based on weight. - * Change from 'int' to 'long' to accomate big stacks of gold. + * Change from 'int' to 'long' to accommodate big stacks of gold. * Right now we fake it by reporting a partial quantity, but the * likesgold handling m_move results in picking up the whole stack. */ @@ -1739,7 +1739,7 @@ can_carry(struct monst* mtmp, struct obj* otmp) return 0; /* hostile monsters who like gold will pick up the whole stack; - tame mosnters with hands will pick up the partial stack */ + tame monsters with hands will pick up the partial stack */ iquan = (otmp->quan > (long) LARGEST_INT) ? 20000 + rn2(LARGEST_INT - 20000 + 1) : (int) otmp->quan; @@ -3049,7 +3049,7 @@ unstuck(struct monst *mtmp) /* prevent holder/engulfer from immediately re-holding/re-engulfing [note: this call to unstuck() might be because u.ustuck has just changed shape and doesn't have a holding attack any more, hence - don't set mspec_used uncondtionally] */ + don't set mspec_used unconditionally] */ if (!mtmp->mspec_used && (dmgtype(ptr, AD_STCK) || attacktype(ptr, AT_ENGL) || attacktype(ptr, AT_HUGS))) diff --git a/src/mondata.c b/src/mondata.c index 1e3b6f388..297a2fbfd 100644 --- a/src/mondata.c +++ b/src/mondata.c @@ -794,7 +794,7 @@ struct alt_spl { }; /* figure out what type of monster a user-supplied string is specifying; - ingore anything past the monster name */ + ignore anything past the monster name */ int name_to_mon(const char *in_str, int *gender_name_var) { diff --git a/src/muse.c b/src/muse.c index 5f4481094..6f2ecdf70 100644 --- a/src/muse.c +++ b/src/muse.c @@ -2941,7 +2941,7 @@ muse_unslime( boolean was_lit = obj->lamplit ? TRUE : FALSE, saw_lit = FALSE; /* * If not already lit, requires two actions. We cheat and let - * monster do both rather than render the potion unuseable. + * monster do both rather than render the potion unusable. * * Monsters don't start with oil and don't actively pick up oil * so this may never occur in a real game. (Possible though; diff --git a/src/objnam.c b/src/objnam.c index e1425adc9..97c163520 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -320,7 +320,7 @@ distant_name( * (r * r) * 2 - r: instead of a square extending from the hero, * round the corners (so shorter distance imposed for diagonal). * - * distu() matrix convering a range of 3+ for one quadrant: + * distu() matrix covering a range of 3+ for one quadrant: * 16 17 - - - * 9 10 13 18 - * 4 5 8 13 - @@ -3364,7 +3364,7 @@ wizterrainwish(struct _readobjnam_data *d) lev->flags = 0; /* [FIXME: if this isn't a wall or door location where 'horizontal' is already set up, that should be calculated for this spot. - Unforutnately, it can be tricky; placing one in open space + Unfortunately, it can be tricky; placing one in open space and then another adjacent might need to recalculate first one.] */ pline("Iron bars."); madeterrain = TRUE; @@ -4673,7 +4673,7 @@ readobjnam(char *bp, struct obj *no_wish) } if (d.spesgn == 0) { - /* spe not specifed; retain the randomly assigned value */ + /* spe not specified; retain the randomly assigned value */ d.spe = d.otmp->spe; } else if (wizard) { ; /* no restrictions except SPE_LIM */ diff --git a/src/options.c b/src/options.c index 293c1e6d6..a59121ca6 100644 --- a/src/options.c +++ b/src/options.c @@ -526,7 +526,7 @@ parseoptions( if (!got_match) { /* spin through the aliases to see if there's a match in those. Note that if multiple delimited aliases for the same option - becomes desireable in the future, this is where you'll need + becomes desirable in the future, this is where you'll need to split a delimited allopt[i].alias field into each individual alias */ diff --git a/src/pager.c b/src/pager.c index af598a57b..b92e76f3c 100644 --- a/src/pager.c +++ b/src/pager.c @@ -392,7 +392,7 @@ look_at_monster( } /* we know the hero sees a monster at this location, but if it's shown - due to persistant monster detection he might remember something else */ + due to persistent monster detection he might remember something else */ if (mtmp->mundetected || M_AP_TYPE(mtmp)) mhidden_description(mtmp, FALSE, eos(buf)); @@ -725,7 +725,7 @@ checkfile(char *inp, struct permonst *pm, boolean user_typed_name, /* * TODO: * The switch from xname() to doname_vague_quan() in look_at_obj() - * had the unintendded side-effect of making names picked from + * had the unintended side-effect of making names picked from * pointing at map objects become harder to simplify for lookup. * We should split the prefix and suffix handling used by wish * parsing and also wizmode monster generation out into separate @@ -2026,7 +2026,7 @@ doidtrap(void) } /* - Implements a rudimentary if/elif/else/endif interpretor and use + Implements a rudimentary if/elif/else/endif interpreter and use conditionals in dat/cmdhelp to describe what command each keystroke currently invokes, so that there isn't a lot of "(debug mode only)" and "(if number_pad is off)" cluttering the feedback that the user @@ -2036,7 +2036,7 @@ doidtrap(void) keypad vs normal layout of digits, and QWERTZ keyboard swap between y/Y/^Y/M-y/M-Y/M-^Y and z/Z/^Z/M-z/M-Z/M-^Z.) - The interpretor understands + The interpreter understands '&#' for comment, '&? option' for 'if' (also '&? !option' or '&? option=value[,value2,...]' diff --git a/src/pickup.c b/src/pickup.c index b44616318..642a9504e 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -544,7 +544,7 @@ reset_justpicked(struct obj *olist) { struct obj *otmp; /* - * TODO? Possible enchancement: don't reset if hero is still at same + * TODO? Possible enhancement: don't reset if hero is still at same * spot where most recent pickup took place. Not resetting will be * the correct behavior for autopickup immediately followed by manual * pickup. It would probably be correct for either or both pickups @@ -2817,7 +2817,7 @@ use_container( You("owe %ld %s for lost merchandise.", loss, currency(loss)); gc.current_container->owt = weight(gc.current_container); } - /* might put something in if carring anything other than just the + /* might put something in if carrying anything other than just the container itself (invent is not the container or has a next object) */ inokay = (gi.invent != 0 && (gi.invent != gc.current_container || gi.invent->nobj)); @@ -2845,7 +2845,7 @@ use_container( * include the next container choice ('n') when * relevant, and make it the default; * always include the quit choice ('q'), and make - * it the default if there's no next containter; + * it the default if there's no next container; * include the help choice (" or ?") if `cmdassist' * run-time option is set; * (Player can pick any of (o,i,b,r,n,s,?) even when diff --git a/src/polyself.c b/src/polyself.c index 091629ef7..a93cf6a15 100644 --- a/src/polyself.c +++ b/src/polyself.c @@ -411,7 +411,7 @@ newman(void) polyman("You feel like a new %s!", newform); newgend = poly_gender(); - /* note: newman() bypasses achievemnts for new ranks attained and + /* note: newman() bypasses achievements for new ranks attained and doesn't log "new
" when that isn't accompanied by level change */ if (newlvl != oldlvl) livelog_printf(LL_MINORAC, "became experience level %d as a new %s", diff --git a/src/potion.c b/src/potion.c index 54968fb6a..58b52b58f 100644 --- a/src/potion.c +++ b/src/potion.c @@ -45,7 +45,7 @@ static int potion_dip(struct obj *obj, struct obj *potion); /* used to indicate whether quaff or dip has skipped an opportunity to use a fountain or such, in order to vary the feedback if hero lacks any potions [reinitialized every time it's used so does not need to - be placed in struct instance_globals g] */ + be placed in struct instance_globals gd] */ static int drink_ok_extra = 0; /* force `val' to be within valid range for intrinsic timeout value */ @@ -1422,7 +1422,7 @@ healup(int nhp, int nxtra, boolean curesick, boolean cureblind) } } if (cureblind) { - /* 3.6.1: it's debatible whether healing magic should clean off + /* 3.6.1: it's debatable whether healing magic should clean off mundane 'dirt', but if it doesn't, blindness isn't cured */ u.ucreamed = 0; make_blinded(0L, TRUE); diff --git a/src/pray.c b/src/pray.c index 2f9be4e6c..b185f391e 100644 --- a/src/pray.c +++ b/src/pray.c @@ -2042,7 +2042,7 @@ pray_revive(void) return (revive(otmp, TRUE) != NULL); } -/* #pray commmand */ +/* #pray command */ int dopray(void) { @@ -2291,7 +2291,7 @@ doturn(void) * chaotic oneself (see "For some reason" above) and chaotic * turning only makes targets peaceful. * - * Paralysis duration probably ought to be based on the strengh + * Paralysis duration probably ought to be based on the strength * of turned creatures rather than on turner's level. * Why doesn't this honor Free_action? [Because being able to * repeat #turn every turn would be too powerful. Maybe instead diff --git a/src/read.c b/src/read.c index acab63950..044a2f3d7 100644 --- a/src/read.c +++ b/src/read.c @@ -184,7 +184,7 @@ tshirt_text(struct obj* tshirt, char* buf) Theory" although they didn't create it (and an actual T-shirt with pentagonal diagram showing which choices defeat which) */ "rock--paper--scissors--lizard--Spock!", - /* "All men must die -- all men must serve" challange and response + /* "All men must die -- all men must serve" challenge and response from book series _A_Song_of_Ice_and_Fire_ by George R.R. Martin, TV show "Game of Thrones" (probably an actual T-shirt too...) */ "/Valar morghulis/ -- /Valar dohaeris/", @@ -3044,7 +3044,7 @@ create_particular_parse( * If d->fem is already set to MALE or FEMALE at this juncture, it means * one of those terms was explicitly specified. */ - if (d->fem == MALE || d->fem == FEMALE) { /* explicity expressed */ + if (d->fem == MALE || d->fem == FEMALE) { /* explicitly expressed */ if ((gender_name_var != NEUTRAL) && (d->fem != gender_name_var)) { /* apparent selection incompatibility */ d->genderconf = gender_name_var; /* resolve later */ @@ -3107,7 +3107,7 @@ create_particular_creation( else if (d->randmonst) whichpm = rndmonst(); if (d->genderconf == -1) { - /* no confict exists between explicit gender term and + /* no conflict exists between explicit gender term and the specified monster name */ if (d->fem != -1 && (!whichpm || (!is_male(whichpm) && !is_female(whichpm)))) diff --git a/src/rect.c b/src/rect.c index 8b677112f..938ebb747 100644 --- a/src/rect.c +++ b/src/rect.c @@ -21,7 +21,7 @@ static int n_rects = 0; static int rect_cnt; /* - * Initialisation of internal structures. Should be called for every + * Initialization of internal structures. Should be called for every * new level to be build... */ diff --git a/src/rumors.c b/src/rumors.c index ccecad594..d2d1da9f6 100644 --- a/src/rumors.c +++ b/src/rumors.c @@ -371,7 +371,7 @@ others_check( if (entrycount == 2) { putstr(tmpwin, 0, "(only two entries)"); } else { - /* showing an elipsis avoids ambiguity about whether + /* showing an ellipsis avoids ambiguity about whether there are other lines; doing so three times (once for each file) results in total output being 24 lines, forcing a --More-- prompt if using a 24 line screen; @@ -548,7 +548,7 @@ outrumor( : (rn2(2) ? "nonchalantly " : "")))); SetVoice((struct monst *) 0, 0, 80, voice_oracle); verbalize1(line); - /* [WIS exercized by getrumor()] */ + /* [WIS exercised by getrumor()] */ return; case BY_COOKIE: pline(fortune_msg); diff --git a/src/steed.c b/src/steed.c index 13971e8bd..5f6c66bf0 100644 --- a/src/steed.c +++ b/src/steed.c @@ -514,7 +514,7 @@ landing_spot( if (min_distance < 0 /* no viable candidate yet */ /* or better than pending candidate (note: orthogonal spots are distance 1 and diagonal ones distance 2; - treating one as better than the other is arbitary + treating one as better than the other is arbitrary and not wanted for DISMOUNT_KNOCKED) */ || ((best_j == -1) ? (distance < min_distance) : (j < 3)) /* or equally good, maybe substitute this one */ diff --git a/src/timeout.c b/src/timeout.c index 865704164..8671fb1c1 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -1904,7 +1904,7 @@ wiz_timeout_queue(void) putstr(win, 0, ""); print_queue(win, gt.timer_base); - /* Timed properies: + /* Timed properties: * check every one; the majority can't obtain temporary timeouts in * normal play but those can be forced via the #wizintrinsic command. */ @@ -2526,7 +2526,7 @@ timer_stats(const char* hdrfmt, char *hdrbuf, long *count, long *size) RESTORE_WARNING_FORMAT_NONLITERAL -/* reset all timers that are marked for reseting */ +/* reset all timers that are marked for resetting */ void relink_timers(boolean ghostly) { diff --git a/src/topten.c b/src/topten.c index 1823f8719..95a913707 100644 --- a/src/topten.c +++ b/src/topten.c @@ -434,7 +434,7 @@ encodeconduct(void) reporting "obeyed sokoban rules" is misleading if sokoban wasn't completed or at least attempted; however, suppressing that when sokoban was never entered, as we do here, risks reporting - "violated sokoban rules" when no such thing occured; this can + "violated sokoban rules" when no such thing occurred; this can be disambiguated in xlogfile post-processors by testing the entered-sokoban bit in the 'achieve' field */ if (!u.uconduct.sokocheat && sokoban_in_play()) diff --git a/src/trap.c b/src/trap.c index 1fccad303..ef385a3cf 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1168,7 +1168,7 @@ trapeffect_rocktrap( pline("A trap door in %s opens and %s falls on your %s!", the(ceiling(u.ux, u.uy)), an(xname(otmp)), body_part(HEAD)); if (uarmh) { - /* normally passes_rocks() would protect againt a falling + /* normally passes_rocks() would protect against a falling rock, but not when wearing a helmet */ if (passes_rocks(gy.youmonst.data)) { pline("Unfortunately, you are wearing %s.", @@ -1435,7 +1435,7 @@ trapeffect_rust_trap( goto uglovecheck; default: pline("%s you!", A_gush_of_water_hits); - /* note: exclude primary and seconary weapons from splashing + /* note: exclude primary and secondary weapons from splashing because cases 1 and 2 target them [via water_damage()] */ for (otmp = gi.invent; otmp; otmp = otmp->nobj) if (otmp->lamplit && otmp != uwep @@ -3330,7 +3330,7 @@ mintrap(struct monst *mtmp, unsigned mintrapflags) trap_result = trapeffect_selector(mtmp, trap, mintrapflags); /* mtmp can't stay hiding under an object if trapped in non-pit - (mtmp hiding under object at armed bear trap loccation, hero + (mtmp hiding under object at armed bear trap location, hero zaps wand of locking or spell of wizard lock at spot triggering the trap and trapping mtmp there) */ if (!DEADMONSTER(mtmp) && mtmp->mtrapped) { diff --git a/src/uhitm.c b/src/uhitm.c index 9956736d9..1195490b3 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -1999,7 +1999,7 @@ steal_it(struct monst *mdef, struct attack *mattk) if (ustealo) { /* we will be taking everything */ char heshe[20]; - /* 3.7: this uses hero's base gender rather than nymph feminimity + /* 3.7: this uses hero's base gender rather than nymph femininity but was using hardcoded pronouns She/her for target monster; switch to dynamic pronoun */ if (gender(mdef) == (int) u.mfemale @@ -3841,7 +3841,7 @@ mhitm_ad_phys( /* when magr's weapon is an artifact, caller suppressed its usual 'hit' message in case artifact_hit() delivers one; now we'll know and might need to deliver skipped message - (note: if there's no message there'll be no auxilliary + (note: if there's no message there'll be no auxiliary damage so the message here isn't coming too late) */ if (!artifact_hit(magr, mdef, mwep, &mhm->damage, mhm->dieroll)) { @@ -5590,7 +5590,7 @@ passive(struct monst *mon, * positive enchantment, it ought to be subject to * having that enchantment reduced. But we don't have * sufficient information here to know which hand/ring - * has delived a weaponless blow. + * has delivered a weaponless blow. */ ; } diff --git a/src/worm.c b/src/worm.c index c4bb81907..6ff5bdb76 100644 --- a/src/worm.c +++ b/src/worm.c @@ -82,7 +82,7 @@ static long wgrowtime[MAX_NUM_WORMS] = DUMMY; * there are no slots available. This means that the worm head can exist, * it just cannot ever grow a tail. * - * It, also, means that there is an optimisation to made. The [0] positions + * It, also, means that there is an optimization to made. The [0] positions * of the arrays are never used. Meaning, we really *could* have one more * tailed worm on the level, or use a smaller array (using wormno - 1). * diff --git a/src/worn.c b/src/worn.c index ec56204e5..4bb8b0bfc 100644 --- a/src/worn.c +++ b/src/worn.c @@ -159,7 +159,7 @@ allunworn(void) } -/* return item worn in slot indiciated by wornmask; needed by poly_obj() */ +/* return item worn in slot indicated by wornmask; needed by poly_obj() */ struct obj * wearmask_to_obj(long wornmask) { @@ -333,12 +333,12 @@ mon_adjust_speed( } } -/* alchemy smock confers two properites, poison and acid resistance +/* alchemy smock confers two properties, poison and acid resistance but objects[ALCHEMY_SMOCK].oc_oprop can only describe one of them; if it is poison resistance, alternate property is acid resistance; - if someone changes it to acid resistance, alt becomes posion resist; + if someone changes it to acid resistance, alt becomes poison resist; if someone changes it to hallucination resistance, all bets are off - [TODO: handle alternate propertices conferred by dragon scales/mail] */ + [TODO: handle alternate properties conferred by dragon scales/mail] */ #define altprop(o) \ (((o)->otyp == ALCHEMY_SMOCK) \ ? (POISON_RES + ACID_RES - objects[(o)->otyp].oc_oprop) \ diff --git a/src/zap.c b/src/zap.c index f50214fcc..0658c83e9 100644 --- a/src/zap.c +++ b/src/zap.c @@ -228,7 +228,7 @@ bhitm(struct monst *mtmp, struct obj *otmp) case SPE_POLYMORPH: case POT_POLYMORPH: if (mtmp->data == &mons[PM_LONG_WORM] && has_mcorpsenm(mtmp)) { - /* if a long worm has mcorpsenm set, it was polymophed by + /* if a long worm has mcorpsenm set, it was polymorphed by the current zap and shouldn't be affected if hit again */ ; } else if (resists_magm(mtmp)) { @@ -737,7 +737,7 @@ montraits( mtmp2->mblinded = 0; mtmp2->mstun = 0; mtmp2->mconf = 0; - /* when traits are for a shopeekper, dummy monster 'mtmp' won't + /* when traits are for a shopkeeper, dummy monster 'mtmp' won't have necessary eshk data for replmon() -> replshk() */ if (mtmp2->isshk) { neweshk(mtmp); @@ -3320,7 +3320,7 @@ weffects(struct obj *obj) return; } -/* augment damage for a spell dased on the hero's intelligence (and level) */ +/* augment damage for a spell based on the hero's intelligence (and level) */ int spell_damage_bonus( int dmg) /* base amount to be adjusted by bonus or penalty */ @@ -3382,7 +3382,7 @@ spell_hit_bonus(int skill) /* Will change when print stuff below removed */ hit_bon -= 0; else - /* Even increment for dextrous heroes (see weapon.c abon) */ + /* Even increment for dexterous heroes (see weapon.c abon) */ hit_bon += dex - 14; return hit_bon;