nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

some comment spelling fixes

Browse Source
This commit is contained in:
nhmall
2023-03-16 22:27:01 -04:00
parent 90906ed05a
commit de79240dea
51 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/allmain.c
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+5 -5
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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;
src/eat.c
+3 -3
View File
@@ -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;
src/end.c
+2 -2
View File
@@ -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) {
src/exper.c
+1 -1
View File
@@ -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);
src/hack.c
+2 -2
View File
@@ -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 */
src/hacklib.c
+3 -3
View File
@@ -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.
src/insight.c
+2 -2
View File
@@ -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"
src/invent.c
+4 -4
View File
@@ -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
src/makemon.c
+2 -2
View File
@@ -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));
src/mcastu.c
+1 -1
View File
@@ -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 */
src/mdlib.c
+1 -1
View File
@@ -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
src/mhitm.c
+1 -1
View File
@@ -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.
*/
src/mhitu.c
+1 -1
View File
@@ -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)
src/mkobj.c
+3 -3
View File
@@ -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) {
src/mon.c
+6 -6
View File
@@ -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)))
src/mondata.c
+1 -1
View File
@@ -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)
{
src/muse.c
+1 -1
View File
@@ -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;
src/objnam.c
+3 -3
View File
@@ -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 */
src/options.c
+1 -1
View File
@@ -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 */
src/pager.c
+4 -4
View File
@@ -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,...]'
src/pickup.c
+3 -3
View File
@@ -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
src/polyself.c
+1 -1
View File
@@ -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 <form>" when that isn't accompanied by level change */
if (newlvl != oldlvl)
livelog_printf(LL_MINORAC, "became experience level %d as a new %s",
src/potion.c
+2 -2
View File
@@ -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);
src/pray.c
+2 -2
View File
@@ -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
src/read.c
+3 -3
View File
@@ -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))))
src/rect.c
+1 -1
View File
@@ -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...
*/
src/rumors.c
+2 -2
View File
@@ -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);
src/steed.c
+1 -1
View File
@@ -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 */
src/timeout.c
+2 -2
View File
@@ -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)
{
src/topten.c
+1 -1
View File
@@ -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())
src/trap.c
+3 -3
View File
@@ -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) {
src/uhitm.c
+3 -3
View File
@@ -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.
*/
;
}
src/worm.c
+1 -1
View File
@@ -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).
*
src/worn.c
+4 -4
View File
@@ -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) \
src/zap.c
+4 -4
View File
@@ -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;