diff -Ndur nethack-3.4.3/bin/logfile nethack-patched/bin/logfile
--- nethack-3.4.3/bin/logfile 2006-04-09 23:26:14.000000000 +0000
+++ nethack-patched/bin/logfile 2005-11-19 13:21:44.000000000 +0000
@@ -1,2 +1 @@
3.4.3 0 0 1 1 10 10 0 20051119 20051119 42 Tou Hum Fem Neu foo,quit
-3.4.3 923 0 6 7 26 26 1 20060409 20060409 42 Wiz Orc Fem Cha wizard,quit
diff -Ndur nethack-3.4.3/include/artilist.h nethack-patched/include/artilist.h
--- nethack-3.4.3/include/artilist.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/artilist.h 2006-04-25 22:21:36.000000000 +0000
@@ -137,7 +137,7 @@
* or the shriek that shrieked he,
* As I gnashed my teeth, and from my sheath
* I drew my Snickersnee!
- * --Koko, Lord high executioner of Titipu
+ * --Ko-Ko, Lord High Executioner of Titipu
* (From Sir W.S. Gilbert's "The Mikado")
*/
A("Snickersnee", KATANA,
diff -Ndur nethack-3.4.3/include/color.h nethack-patched/include/color.h
--- nethack-3.4.3/include/color.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/color.h 2006-04-25 22:23:22.000000000 +0000
@@ -8,7 +8,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
- * exceptions, these are listed below. Bright black doesn't mean very
+ * exceptions; these are listed below. Bright black doesn't mean very
* much, so it is used as the "default" foreground color of the screen.
*/
#define CLR_BLACK 0
@@ -29,7 +29,7 @@
#define CLR_WHITE 15
#define CLR_MAX 16
-/* The "half-way" point for tty based color systems. This is used in */
+/* The "half-way" point for tty-based color systems. This is used in */
/* the tty color setup code. (IMHO, it should be removed - dean). */
#define BRIGHT 8
diff -Ndur nethack-3.4.3/include/config.h nethack-patched/include/config.h
--- nethack-3.4.3/include/config.h 2005-11-19 00:03:52.000000000 +0000
+++ nethack-patched/include/config.h 2006-04-25 22:26:00.000000000 +0000
@@ -42,7 +42,7 @@
* Define all of those you want supported in your binary.
* Some combinations make no sense. See the installation document.
*/
-#define TTY_GRAPHICS /* good old tty based graphics */
+#define TTY_GRAPHICS /* good old tty-based graphics */
/* #define X11_GRAPHICS */ /* X11 interface */
/* #define QT_GRAPHICS */ /* Qt interface */
/* #define GNOME_GRAPHICS */ /* Gnome interface */
@@ -83,7 +83,7 @@
#endif
#ifdef QT_GRAPHICS
-# define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
+# define DEFAULT_WC_TILED_MAP /* Default to tiles if user doesn't say wc_ascii_map */
# define USER_SOUNDS /* Use sounds */
# ifndef __APPLE__
# define USER_SOUNDS_REGEX
@@ -119,7 +119,7 @@
#ifdef X11_GRAPHICS
/*
- * There are two ways that X11 tiles may be defined. (1) using a custom
+ * There are two ways that X11 tiles may be defined: (1) using a custom
* format loaded by NetHack code, or (2) using the XPM format loaded by
* the free XPM library. The second option allows you to then use other
* programs to generate tiles files. For example, the PBMPlus tools
diff -Ndur nethack-3.4.3/include/config1.h nethack-patched/include/config1.h
--- nethack-3.4.3/include/config1.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/config1.h 2006-04-25 22:34:14.000000000 +0000
@@ -6,7 +6,7 @@
#define CONFIG1_H
/*
- * MS DOS - compilers
+ * MS-DOS - compilers
*
* Microsoft C auto-defines MSDOS,
* Borland C auto-defines __MSDOS__,
diff -Ndur nethack-3.4.3/include/decl.h nethack-patched/include/decl.h
--- nethack-3.4.3/include/decl.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/decl.h 2006-04-25 22:41:30.000000000 +0000
@@ -73,7 +73,7 @@
d_level d_qstart_level, d_qlocate_level, d_nemesis_level;
d_level d_knox_level;
} dungeon_topology;
-/* macros for accesing the dungeon levels by their old names */
+/* macros for accessing the dungeon levels by their old names */
#define oracle_level (dungeon_topology.d_oracle_level)
#define bigroom_level (dungeon_topology.d_bigroom_level)
#ifdef REINCARNATION
@@ -142,7 +142,7 @@
E struct linfo level_info[MAXLINFO];
E NEARDATA struct sinfo {
- int gameover; /* self explanatory? */
+ int gameover; /* self-explanatory? */
int stopprint; /* inhibit further end of game disclosure */
#if defined(UNIX) || defined(VMS) || defined (__EMX__) || defined(WIN32)
int done_hup; /* SIGHUP or moral equivalent received
diff -Ndur nethack-3.4.3/include/dgn_file.h nethack-patched/include/dgn_file.h
--- nethack-3.4.3/include/dgn_file.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/dgn_file.h 2006-04-25 22:42:28.000000000 +0000
@@ -45,7 +45,7 @@
};
/*
- * Values for type for tmpbranch structure.
+ * Values for type in tmpbranch structure.
*/
#define TBR_STAIR 0 /* connection with both ends having a staircase */
#define TBR_NO_UP 1 /* connection with no up staircase */
diff -Ndur nethack-3.4.3/include/display.h nethack-patched/include/display.h
--- nethack-3.4.3/include/display.h 2005-11-18 23:34:08.000000000 +0000
+++ nethack-patched/include/display.h 2006-04-25 22:52:42.000000000 +0000
@@ -1,5 +1,5 @@
/* SCCS Id: @(#)display.h 3.4 1999/11/30 */
-/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
+/* Copyright (c) Dean Luick, with acknowledgments to Kevin Darcy */
/* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
@@ -22,12 +22,12 @@
* sensemon()
*
* Returns true if the hero can sense the given monster. This includes
- * monsters that are hiding or mimicing other monsters.
+ * monsters that are hiding or mimicking other monsters.
*/
#define tp_sensemon(mon) ( /* The hero can always sense a monster IF: */\
(!mindless(mon->data)) && /* 1. the monster has a brain to sense AND */\
((Blind && Blind_telepat) || /* 2a. hero is blind and telepathic OR */\
- /* 2b. hero is using a telepathy inducing */\
+ /* 2b. hero is using a telepathy-inducing */\
/* object and in range */\
(Unblind_telepat && \
(distu(mon->mx, mon->my) <= (BOLT_LIM * BOLT_LIM)))) \
@@ -55,7 +55,7 @@
#define mon_visible(mon) ( /* The hero can see the monster */\
/* IF the monster */\
(!mon->minvis || See_invisible) && /* 1. is not invisible AND */\
- (!mon->mundetected) && /* 2. not an undetected hider */\
+ (!mon->mundetected) && /* 2. is not an undetected hider */\
(!(mon->mburied || u.uburied)) /* 3. neither you or it is buried */\
)
@@ -115,7 +115,7 @@
/*
* is_safepet(mon)
*
- * A special case check used in attack() and domove(). Placing the
+ * A special-case check used in attack() and domove(). Placing the
* definition here is convenient.
*/
#define is_safepet(mon) \
@@ -151,7 +151,7 @@
* what_mon()
* what_trap()
*
- * If hallucinating, choose a random object/monster, otherwise, use the one
+ * If hallucinating, choose a random object/monster; otherwise, use the one
* given.
*/
#define what_obj(obj) (Hallucination ? random_object() : obj)
@@ -182,7 +182,7 @@
#define DISP_FREEMEM (-6) /* Free all memory during exit only. */
-/* Total number of cmap indices in the sheild_static[] array. */
+/* Total number of cmap indices in the shield_static[] array. */
#define SHIELD_COUNT 21
@@ -213,16 +213,16 @@
/*
* A glyph is an abstraction that represents a _unique_ monster, object,
* dungeon part, or effect. The uniqueness is important. For example,
- * It is not enough to have four (one for each "direction") zap beam glyphs,
+ * it is not enough to have four (one for each "direction") zap beam glyphs;
* we need a set of four for each beam type. Why go to so much trouble?
- * Because it is possible that any given window dependent display driver
+ * Because it is possible that any given window-dependent display driver
* [print_glyph()] can produce something different for each type of glyph.
* That is, a beam of cold and a beam of fire would not only be different
* colors, but would also be represented by different symbols.
*
* Glyphs are grouped for easy accessibility:
*
- * monster Represents all the wild (not tame) monsters. Count: NUMMONS.
+ * monster Represents all the wild (not tame) monsters. Count: NUMMONS
*
* pet Represents all of the tame monsters. Count: NUMMONS
*
@@ -318,7 +318,7 @@
/*
- * Change the given glyph into it's given type. Note:
+ * Change the given glyph into its given type. Note:
* 1) Pets, detected, and ridden monsters are animals and are converted
* to the proper monster number.
* 2) Bodies are all mapped into the generic CORPSE object
diff -Ndur nethack-3.4.3/include/dlb.h nethack-patched/include/dlb.h
--- nethack-3.4.3/include/dlb.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/dlb.h 2006-04-25 22:54:20.000000000 +0000
@@ -40,7 +40,7 @@
# define DLBFILE "nhdat" /* name of library */
# endif
# ifndef FILENAME_CMP
-# define FILENAME_CMP strcmp /* case sensitive */
+# define FILENAME_CMP strcmp /* case-sensitive */
# endif
#endif /* DLBLIB */
diff -Ndur nethack-3.4.3/include/dungeon.h nethack-patched/include/dungeon.h
--- nethack-3.4.3/include/dungeon.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/dungeon.h 2006-04-25 22:58:34.000000000 +0000
@@ -23,7 +23,7 @@
struct s_level *next;
d_level dlevel; /* dungeon & level numbers */
char proto[15]; /* name of prototype file (eg. "tower") */
- char boneid; /* character to id level in bones files */
+ char boneid; /* character to ID level in bones files */
uchar rndlevs; /* no. of randomly available similar levels */
d_flags flags; /* type flags */
} s_level;
@@ -43,7 +43,7 @@
#define LR_UPTELE 5
#define LR_DOWNTELE 6
-typedef struct dest_area { /* non-stairway level change indentifier */
+typedef struct dest_area { /* non-stairway level change identifier */
xchar lx, ly; /* "lower" left corner (near [0,0]) */
xchar hx, hy; /* "upper" right corner (near [COLNO,ROWNO]) */
xchar nlx, nly; /* outline of invalid area */
@@ -53,7 +53,7 @@
typedef struct dungeon { /* basic dungeon identifier */
char dname[24]; /* name of the dungeon (eg. "Hell") */
char proto[15]; /* name of prototype file (eg. "tower") */
- char boneid; /* character to id dungeon in bones files */
+ char boneid; /* character to ID dungeon in bones files */
d_flags flags; /* dungeon flags */
xchar entry_lev; /* entry level */
xchar num_dunlevs; /* number of levels in this dungeon */
@@ -123,7 +123,7 @@
#define Is_knox(x) (on_level(x, &knox_level))
#define In_sokoban(x) ((x)->dnum == sokoban_dnum)
-#define Inhell In_hell(&u.uz) /* now gehennom */
+#define Inhell In_hell(&u.uz) /* now Gehennom */
#define In_endgame(x) ((x)->dnum == astral_level.dnum)
#define within_bounded_area(X,Y,LX,LY,HX,HY) \
@@ -152,7 +152,7 @@
#define LFILE_EXISTS 0x04 /* a level file exists for this level */
/*
* Note: VISITED and LFILE_EXISTS are currently almost always set at the
- * same time. However they _mean_ different things.
+ * same time. However, they _mean_ different things.
*/
#ifdef MFLOPPY
diff -Ndur nethack-3.4.3/include/edog.h nethack-patched/include/edog.h
--- nethack-3.4.3/include/edog.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/edog.h 2006-04-25 22:59:08.000000000 +0000
@@ -18,7 +18,7 @@
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 -Ndur nethack-3.4.3/include/eshk.h nethack-patched/include/eshk.h
--- nethack-3.4.3/include/eshk.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/eshk.h 2006-04-26 14:34:10.000000000 +0000
@@ -26,8 +26,8 @@
schar unused; /* to force alignment for stupid compilers */
boolean following; /* following customer since he owes us sth */
boolean surcharge; /* angry shk inflates prices */
- coord shk; /* usual position shopkeeper */
- coord shd; /* position shop door */
+ coord shk; /* usual position of shopkeeper */
+ coord shd; /* position of shop door */
d_level shoplevel; /* level (& dungeon) of his shop */
int billct; /* no. of entries of bill[] in use */
struct bill_x bill[BILLSZ];
diff -Ndur nethack-3.4.3/include/flag.h nethack-patched/include/flag.h
--- nethack-3.4.3/include/flag.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/flag.h 2006-04-27 01:14:12.000000000 +0000
@@ -56,7 +56,7 @@
boolean mv;
boolean bypasses; /* bypass flag is set on at least one fobj */
boolean nap; /* `timed_delay' option for display effects */
- boolean nopick; /* do not pickup objects (as when running) */
+ boolean nopick; /* do not pick up objects (as when running) */
boolean null; /* OK to send nulls to the terminal */
#ifdef MAC
boolean page_wait; /* put up a --More-- after a page of messages */
@@ -75,7 +75,7 @@
#endif
boolean silent; /* whether the bell rings or not */
boolean sortpack; /* sorted inventory */
- boolean soundok; /* ok to tell about sounds heard */
+ boolean soundok; /* OK to tell about sounds heard */
boolean sparkle; /* show "resisting" special FX (Scott Bigham) */
boolean standout; /* use standout for --More-- */
boolean time; /* display elapsed 'time' */
@@ -89,7 +89,7 @@
unsigned long suppress_alert;
#define NEW_MOON 0
#define FULL_MOON 4
- unsigned no_of_wizards; /* 0, 1 or 2 (wizard and his shadow) */
+ unsigned no_of_wizards; /* 0, 1, or 2 (wizard and his shadow) */
boolean travel; /* find way automatically to u.tx,u.ty */
unsigned run; /* 0: h (etc), 1: H (etc), 2: fh (etc) */
/* 3: FH, 4: ff+, 5: ff-, 6: FF+, 7: FF- */
@@ -110,7 +110,7 @@
char menu_style; /* User interface style setting */
#ifdef AMII_GRAPHICS
int numcols;
- unsigned short amii_dripens[ 20 ]; /* DrawInfo Pens currently there are 13 in v39 */
+ unsigned short amii_dripens[ 20 ]; /* DrawInfo Pens; currently there are 13 in v39 */
AMII_COLOR_TYPE amii_curmap[ AMII_MAXCOLORS ]; /* colormap */
#endif
@@ -118,7 +118,7 @@
*
* If the user wishes to select a role, race, gender, and/or alignment
* during startup, the choices should be recorded here. This
- * might be specified through command-line options, environmental
+ * might be specified through command-line options, environment
* variables, a popup dialog box, menus, etc.
*
* These values are each an index into an array. They are not
@@ -196,20 +196,20 @@
#endif
#ifdef MAC_GRAPHICS_ENV
boolean MACgraphics; /* use Macintosh extended character set, as
- as defined in the special font HackFont */
+ defined in the special font HackFont */
unsigned use_stone; /* use the stone ppats */
#endif
#if defined(MSDOS) || defined(WIN32)
boolean hassound; /* has a sound card */
boolean usesound; /* use the sound card */
- boolean usepcspeaker; /* use the pc speaker */
+ boolean usepcspeaker; /* use the PC speaker */
boolean tile_view;
boolean over_view;
boolean traditional_view;
#endif
#ifdef MSDOS
- boolean hasvga; /* has a vga adapter */
- boolean usevga; /* use the vga adapter */
+ boolean hasvga; /* has a VGA adapter */
+ boolean usevga; /* use the VGA adapter */
boolean grmode; /* currently in graphics mode */
#endif
#ifdef LAN_FEATURES
@@ -219,18 +219,18 @@
/*
* Window capability support.
*/
- boolean wc_color; /* use color graphics */
- boolean wc_hilite_pet; /* hilight pets */
- boolean wc_ascii_map; /* show map using traditional ascii */
- boolean wc_tiled_map; /* show map using tiles */
- boolean wc_preload_tiles; /* preload tiles into memory */
- int wc_tile_width; /* tile width */
- int wc_tile_height; /* tile height */
- char *wc_tile_file; /* name of tile file;overrides default */
- boolean wc_inverse; /* use inverse video for some things */
- int wc_align_status; /* status win at top|bot|right|left */
- int wc_align_message; /* message win at top|bot|right|left */
- int wc_vary_msgcount; /* show more old messages at a time */
+ boolean wc_color; /* use color graphics */
+ boolean wc_hilite_pet; /* highlight pets */
+ boolean wc_ascii_map; /* show map using traditional ascii */
+ boolean wc_tiled_map; /* show map using tiles */
+ boolean wc_preload_tiles; /* preload tiles into memory */
+ int wc_tile_width; /* tile width */
+ int wc_tile_height; /* tile height */
+ char *wc_tile_file; /* name of tile file; overrides default */
+ boolean wc_inverse; /* use inverse video for some things */
+ int wc_align_status; /* status win at top|bot|right|left */
+ int wc_align_message; /* message win at top|bot|right|left */
+ int wc_vary_msgcount; /* show more old messages at a time */
char *wc_foregrnd_menu; /* points to foregrnd color name for menu win */
char *wc_backgrnd_menu; /* points to backgrnd color name for menu win */
char *wc_foregrnd_message; /* points to foregrnd color name for msg win */
@@ -239,33 +239,33 @@
char *wc_backgrnd_status; /* points to backgrnd color name for status win */
char *wc_foregrnd_text; /* points to foregrnd color name for text win */
char *wc_backgrnd_text; /* points to backgrnd color name for text win */
- char *wc_font_map; /* points to font name for the map win */
- char *wc_font_message; /* points to font name for message win */
- char *wc_font_status; /* points to font name for status win */
- char *wc_font_menu; /* points to font name for menu win */
- char *wc_font_text; /* points to font name for text win */
- int wc_fontsiz_map; /* font size for the map win */
- int wc_fontsiz_message; /* font size for the message window */
- int wc_fontsiz_status; /* font size for the status window */
- int wc_fontsiz_menu; /* font size for the menu window */
- int wc_fontsiz_text; /* font size for text windows */
- int wc_scroll_amount; /* scroll this amount at scroll_margin */
+ char *wc_font_map; /* points to font name for the map win */
+ char *wc_font_message; /* points to font name for message win */
+ char *wc_font_status; /* points to font name for status win */
+ char *wc_font_menu; /* points to font name for menu win */
+ char *wc_font_text; /* points to font name for text win */
+ int wc_fontsiz_map; /* font size for the map win */
+ int wc_fontsiz_message; /* font size for the message window */
+ int wc_fontsiz_status; /* font size for the status window */
+ int wc_fontsiz_menu; /* font size for the menu window */
+ int wc_fontsiz_text; /* font size for text windows */
+ int wc_scroll_amount; /* scroll this amount at scroll_margin */
int wc_scroll_margin; /* scroll map when this far from
the edge */
int wc_map_mode; /* specify map viewing options, mostly
for backward compatibility */
int wc_player_selection; /* method of choosing character */
boolean wc_splash_screen; /* display an opening splash screen or not */
- boolean wc_popup_dialog; /* put queries in pop up dialogs instead of
+ boolean wc_popup_dialog; /* put queries in popup dialogs instead of
in the message window */
- boolean wc_eight_bit_input; /* allow eight bit input */
+ boolean wc_eight_bit_input; /* allow eight-bit input */
boolean wc_mouse_support; /* allow mouse support */
boolean wc2_fullscreen; /* run fullscreen */
boolean wc2_softkeyboard; /* use software keyboard */
boolean wc2_wraptext; /* wrap text */
boolean cmdassist; /* provide detailed assistance for some commands */
- boolean obsolete; /* obsolete options can point at this, it isn't used */
+ boolean obsolete; /* obsolete options can point at this; it isn't used */
/* Items which belong in flags, but are here to allow save compatibility */
boolean lootabc; /* use "a/b/c" rather than "o/i/b" when looting */
boolean showrace; /* show hero glyph by race rather than by role */
@@ -283,7 +283,7 @@
};
/*
- * Old deprecated names
+ * Old, deprecated names
*/
#ifdef TTY_GRAPHICS
#define eight_bit_tty wc_eight_bit_input
diff -Ndur nethack-3.4.3/include/global.h nethack-patched/include/global.h
--- nethack-3.4.3/include/global.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/global.h 2006-04-27 01:18:36.000000000 +0000
@@ -14,7 +14,7 @@
* Files expected to exist in the playground directory.
*/
-#define RECORD "record" /* file containing list of topscorers */
+#define RECORD "record" /* file containing list of top scorers */
#define HELP "help" /* file containing command descriptions */
#define SHELP "hh" /* abbreviated form of the same */
#define DEBUGHELP "wizhelp" /* file containing debug mode cmds */
@@ -22,7 +22,7 @@
#define ORACLEFILE "oracles" /* file with oracular information */
#define DATAFILE "data" /* file giving the meaning of symbols used */
#define CMDHELPFILE "cmdhelp" /* file telling what commands do */
-#define HISTORY "history" /* file giving nethack's history */
+#define HISTORY "history" /* file giving NetHack's history */
#define LICENSE "license" /* file with license information */
#define OPTIONFILE "opthelp" /* file explaining runtime options */
#define OPTIONS_USED "options" /* compile-time options, for #version */
@@ -30,7 +30,7 @@
#define LEV_EXT ".lev" /* extension for special level files */
-/* Assorted definitions that may depend on selections in config.h. */
+/* Assorted definitions that may depend on selections in config.h */
/*
* for DUMB preprocessor and compiler, e.g., cpp and pcc supplied
@@ -47,8 +47,8 @@
#endif /* DUMB */
/*
- * type xchar: small integers in the range 0 - 127, usually coordinates
- * although they are nonnegative they must not be declared unsigned
+ * type xchar: small integers in the range 0 - 127, usually coordinates.
+ * Although they are nonnegative they must not be declared unsigned
* since otherwise comparisons with signed quantities are done incorrectly
*/
typedef schar xchar;
@@ -238,7 +238,7 @@
#ifdef VMS
/* vms_exit() (sys/vms/vmsmisc.c) expects the non-VMS EXIT_xxx values below.
- * these definitions allow all systems to be treated uniformly, provided
+ * These definitions allow all systems to be treated uniformly, provided
* main() routines do not terminate with return(), whose value is not
* so massaged.
*/
@@ -323,7 +323,7 @@
#define BUFSZ 256 /* for getlin buffers */
#define QBUFSZ 128 /* for building question text */
-#define TBUFSZ 300 /* toplines[] buffer max msg: 3 81char names */
+#define TBUFSZ 300 /* toplines[] buffer max msg: 3 81-char names */
/* plus longest prefix plus a few extra words */
#define PL_NSIZ 32 /* name of player, ghost, shopkeeper */
diff -Ndur nethack-3.4.3/include/hack.h nethack-patched/include/hack.h
--- nethack-3.4.3/include/hack.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/hack.h 2006-04-27 12:50:36.000000000 +0000
@@ -209,7 +209,7 @@
/* Macros for launching objects */
#define ROLL 0x01 /* the object is rolling */
-#define FLING 0x02 /* the object is flying thru the air */
+#define FLING 0x02 /* the object is flying through the air */
#define LAUNCH_UNSEEN 0x40 /* hero neither caused nor saw it */
#define LAUNCH_KNOWN 0x80 /* the hero caused this by explicit action */
diff -Ndur nethack-3.4.3/include/load_img.h nethack-patched/include/load_img.h
--- nethack-3.4.3/include/load_img.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/load_img.h 2006-04-27 12:54:06.000000000 +0000
@@ -2,20 +2,20 @@
/* ------------------------------------------- */
#define XIMG 0x58494D47
-/* Header of GEM Image Files */
+/* Header of GEM image files */
typedef struct IMG_HEADER{
- short version; /* Img file format version (1) */
- short length; /* Header length in words (8) */
- short planes; /* Number of bit-planes (1) */
- short pat_len; /* length of Patterns (2) */
+ short version; /* Image file format version (1) */
+ short length; /* Header length in words (8) */
+ short planes; /* Number of bitplanes (1) */
+ short pat_len; /* length of Patterns (2) */
short pix_w; /* Pixel width in 1/1000 mmm (372) */
short pix_h; /* Pixel height in 1/1000 mmm (372) */
- short img_w; /* Pixels per line (=(x+7)/8 Bytes) */
+ short img_w; /* Pixels per line (=(x+7)/8 bytes) */
short img_h; /* Total number of lines */
long magic; /* Contains "XIMG" if standard color */
- short paltype; /* palette type (0=RGB (short each)) */
- short *palette; /* palette etc. */
- char *addr; /* Address for the depacked bit-planes */
+ short paltype; /* palette type (0=RGB (short each)) */
+ short *palette; /* palette etc. */
+ char *addr; /* Address for the depacked bitplanes */
} IMG_header;
/* ------------------------------------------- */
@@ -26,21 +26,21 @@
#define ERR_DEPACK 4
#define ERR_COLOR 5
-/* saves the current colorpalette with col colors in palette */
+/* saves the current color palette with col colors in palette */
void get_colors(int handle, short *palette, int col);
/* sets col colors from palette */
-void img_set_colors(int handle,short *palette, int col);
+void img_set_colors(int handle, short *palette, int col);
-/* converts MFDB of size from standard to deviceformat (0 if succeded, else error). */
-int convert(MFDB *, long );
+/* converts MFDB of size from standard to device format (0 if succeeded, else error) */
+int convert(MFDB *, long);
/* transforms image in VDI-Device format */
int transform_img(MFDB *);
-/* Loads & depacks IMG (0 if succeded, else error). */
+/* Loads & depacks IMG (0 if succeeded, else error) */
/* Bitplanes are one after another in address IMG_HEADER.addr. */
int depack_img(char *, IMG_header *);
-/* Halves IMG in Device-format, dest memory has to be allocated*/
+/* Halves IMG in device format, dest memory has to be allocated */
int half_img(MFDB *,MFDB *);
diff -Ndur nethack-3.4.3/include/macconf.h nethack-patched/include/macconf.h
--- nethack-3.4.3/include/macconf.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/macconf.h 2006-04-27 12:57:14.000000000 +0000
@@ -80,8 +80,8 @@
#endif
/*
- * Don't redefine these Unix IO functions when making LevComp or DgnComp for
- * MPW. With MPW, we make them into MPW tools, which use unix IO. SPEC_LEV
+ * Don't redefine these Unix I/O functions when making LevComp or DgnComp for
+ * MPW. With MPW, we make them into MPW tools, which use Unix I/O. SPEC_LEV
* and DGN_COMP are defined when compiling for LevComp and DgnComp respectively.
*/
#if !((defined(__SC__) || defined(__MRC__) || defined(__MACH__)) && (defined(SPEC_LEV) || defined(DGN_COMP)))
@@ -104,7 +104,7 @@
# define SAVE_TYPE 'SAVE'
# define PREF_TYPE 'PREF'
# define DATA_TYPE 'DATA'
-# define MAC_CREATOR 'nh31' /* Registered with DTS ! */
+# define MAC_CREATOR 'nh31' /* Registered with DTS! */
# define TEXT_CREATOR 'ttxt' /* Something the user can actually edit */
/*
diff -Ndur nethack-3.4.3/include/macpopup.h nethack-patched/include/macpopup.h
--- nethack-3.4.3/include/macpopup.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/macpopup.h 2006-04-27 12:57:58.000000000 +0000
@@ -1,5 +1,5 @@
/* SCCS Id: @(#)macpopup.h 3.4 1999/10/25 */
-/* 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 -Ndur nethack-3.4.3/include/mactty.h nethack-patched/include/mactty.h
--- nethack-3.4.3/include/mactty.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/mactty.h 2006-04-27 13:06:20.000000000 +0000
@@ -4,12 +4,12 @@
/*
* This header is the supported external interface for the "tty" window
- * package. This package sports care-free handling of "dumb" tty windows
- * (preferrably using monospaced fonts) - it does NOT remember the strings
+ * package. This package supports carefree handling of "dumb" tty windows
+ * (preferably using monospaced fonts) - it does NOT remember the strings
* sent to it; rather, it uses an offscreen bitmap.
*
* For best performance, make sure it is aligned on a 32-pixel boundary
- * (or at least a 16-pixel one) in black & white. For 24bit color,
+ * (or at least a 16-pixel one) in black & white. For 24-bit color,
* alignment doesn't matter, and for 8-bit color, alignment to every
* fourth pixel is most efficient.
*
@@ -41,7 +41,7 @@
#ifndef _H_tty_public
# define _H_tty_public
-#undef red /* undef internal color const strings from decl */
+#undef red /* undef internal color const strings from decl */
#undef green
#undef blue
#if !TARGET_API_MAC_CARBON
@@ -55,7 +55,7 @@
#define general_failure 1
/*
- * Base resource id's for window types
+ * Base resource IDs for window types
*/
#define WIN_BASE_RES 128
#define WIN_BASE_KIND 128
@@ -81,7 +81,7 @@
*/
#define EXTENDED_SUPPORT 0
/*
- * if you print a lot of single characters, accumulating each one in a
+ * If you print a lot of single characters, accumulating each one in a
* clipping region will take too much time. Instead, define this, which
* will clip in rects.
*/
@@ -112,8 +112,8 @@
*/
# define TA_WRAP_AROUND 4L
/*
- * Overstrike means that characters are added on top of each other; i e don't
- * clear the letter beneath. This is faster, using srcOr under QuickDraw
+ * Overstrike means that characters are added on top of each other; i.e., don't
+ * clear the letter beneath. This is faster, using srcOr under QuickDraw.
*/
# define TA_OVERSTRIKE 8L
/*
@@ -134,7 +134,7 @@
(((long)((r).green>>8)&0xff)<<8)+((long)((r).blue>>8)&0xff))
/*
- * Attributes relating to the cursor, and character set mappings
+ * Attributes relating to the cursor, and to character set mappings
*/
TTY_ATTRIB_CURSOR ,
/*
@@ -233,7 +233,7 @@
short * char_width , short * row_height ) ;
/*
- * The basic move cursor function. 0,0 is topleft.
+ * The basic move-cursor function. 0,0 is the top left corner.
*/
extern short move_tty_cursor ( WindowPtr window , short x_pos ,
short y_pos ) ;
@@ -257,7 +257,7 @@
/*
* Change or read an attribute of the tty. Note that some attribute changes
* may clear the screen. See the above enum and defines for values.
- * Attributes can be both function pointers and special flag values.
+ * Attributes can be either function pointers or special flag values.
*/
extern short get_tty_attrib ( WindowPtr window , tty_attrib attrib ,
long * value ) ;
@@ -275,8 +275,8 @@
/*
* Erase the offscreen bitmap and move the cursor to 0,0. Re-init some window
- * values (font etc) Is always carried out directly on-screen, regardless of
- * the wait-for-update setting. Clears update area.
+ * values (font, etc). Is always carried out directly on-screen, regardless
+ * of the wait-for-update setting. Clears update area.
*/
extern short clear_tty ( WindowPtr window ) ;
@@ -313,8 +313,8 @@
#if EXTENDED_SUPPORT
/*
- * Various versions of delete character/s, insert line/s etc can be handled by
- * this general-purpose function. Negative num_ means delete, positive means
+ * Various versions of delete character/s, insert line/s, etc, can be handled
+ * by this general-purpose function. Negative num_ means delete, positive means
* insert, and you can never be sure which of row and col operations come first
* if you specify both...
*/
@@ -322,7 +322,7 @@
short from_row , short num_rows , short from_col , short num_cols ) ;
/*
- * For framing an area without using grahpics characters.
+ * For framing an area without using graphics characters.
* Note that the given limits are those used for framing, you should not
* draw in them. frame_fatness should typically be 1-5, and may be clipped
* if it is too large.
@@ -337,7 +337,7 @@
short from_col , short to_row , short to_col ) ;
/*
- * For drawing lines on the tty - VERY DEVICE DEPENDENT. Use get_tty_metrics.
+ * For drawing lines on the tty - VERY DEVICE-DEPENDENT. Use get_tty_metrics.
*/
extern short draw_tty_line ( WindowPtr window , short from_x ,
short from_y , short to_x , short to_y ) ;
diff -Ndur nethack-3.4.3/include/mfndpos.h nethack-patched/include/mfndpos.h
--- nethack-3.4.3/include/mfndpos.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/mfndpos.h 2006-04-27 13:09:04.000000000 +0000
@@ -15,9 +15,9 @@
#define UNLOCKDOOR 0x00800000L /* unlocks locked doors */
#define BUSTDOOR 0x01000000L /* breaks any doors */
#define ALLOW_ROCK 0x02000000L /* pushes rocks */
-#define ALLOW_WALL 0x04000000L /* walks thru walls */
+#define ALLOW_WALL 0x04000000L /* walks through walls */
#define ALLOW_DIG 0x08000000L /* digs */
-#define ALLOW_BARS 0x10000000L /* may pass thru iron bars */
+#define ALLOW_BARS 0x10000000L /* may pass through iron bars */
#define ALLOW_SANCT 0x20000000L /* enters temples */
#define ALLOW_SSM 0x40000000L /* ignores scare monster */
#ifdef NHSTDC
diff -Ndur nethack-3.4.3/include/monattk.h nethack-patched/include/monattk.h
--- nethack-3.4.3/include/monattk.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/monattk.h 2006-04-27 13:12:52.000000000 +0000
@@ -48,7 +48,7 @@
#define AD_BLND 11 /* blinds (yellow light) */
#define AD_STUN 12 /* stuns */
#define AD_SLOW 13 /* slows */
-#define AD_PLYS 14 /* paralyses */
+#define AD_PLYS 14 /* paralyzes */
#define AD_DRLI 15 /* drains life levels (Vampire) */
#define AD_DREN 16 /* drains magic energy */
#define AD_LEGS 17 /* damages legs (xan) */
@@ -58,7 +58,7 @@
#define AD_SITM 21 /* steals item (nymphs) */
#define AD_SEDU 22 /* seduces & steals multiple items */
#define AD_TLPT 23 /* teleports you (Quantum Mech.) */
-#define AD_RUST 24 /* rusts armour (Rust Monster)*/
+#define AD_RUST 24 /* rusts armor (Rust Monster)*/
#define AD_CONF 25 /* confuses (Umber Hulk) */
#define AD_DGST 26 /* digests opponent (trapper, etc.) */
#define AD_HEAL 27 /* heals opponent's wounds (nurse) */
@@ -68,7 +68,7 @@
#define AD_DRCO 31 /* drains constitution */
#define AD_DRIN 32 /* drains intelligence (mind flayer) */
#define AD_DISE 33 /* confers diseases */
-#define AD_DCAY 34 /* decays organics (brown Pudding) */
+#define AD_DCAY 34 /* decays organics (brown pudding) */
#define AD_SSEX 35 /* Succubus seduction (extended) */
/* If no SEDUCE then same as AD_SEDU */
#define AD_HALU 36 /* causes hallucination */
@@ -76,8 +76,8 @@
#define AD_PEST 38 /* for Pestilence only */
#define AD_FAMN 39 /* for Famine only */
#define AD_SLIM 40 /* turns you into green slime */
-#define AD_ENCH 41 /* remove enchantment (disenchanter) */
-#define AD_CORR 42 /* corrode armor (black pudding) */
+#define AD_ENCH 41 /* removes enchantment (disenchanter) */
+#define AD_CORR 42 /* corrodes armor (black pudding) */
#define AD_CLRC 240 /* random clerical spell */
#define AD_SPEL 241 /* random magic spell */
@@ -88,7 +88,7 @@
/*
- * Monster to monster attacks. When a monster attacks another (mattackm),
+ * Monster-to-monster attacks. When a monster attacks another (mattackm),
* any or all of the following can be returned. See mattackm() for more
* details.
*/
diff -Ndur nethack-3.4.3/include/mondata.h nethack-patched/include/mondata.h
--- nethack-3.4.3/include/mondata.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/mondata.h 2006-04-27 13:13:52.000000000 +0000
@@ -141,8 +141,8 @@
/* return TRUE if the monster tends to revive */
#define is_reviver(ptr) (is_rider(ptr) || (ptr)->mlet == S_TROLL)
-/* this returns the light's range, or 0 if none; if we add more light emitting
- monsters, we'll likely have to add a new light range field to mons[] */
+/* this returns the light's range, or 0 if none; if we add more light-emitting
+ monsters, we'll likely have to add a new "light range" field to mons[] */
#define emits_light(ptr) (((ptr)->mlet == S_LIGHT || \
(ptr) == &mons[PM_FLAMING_SPHERE] || \
(ptr) == &mons[PM_SHOCKING_SPHERE] || \
diff -Ndur nethack-3.4.3/include/monflag.h nethack-patched/include/monflag.h
--- nethack-3.4.3/include/monflag.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/monflag.h 2006-04-27 17:22:48.000000000 +0000
@@ -74,7 +74,7 @@
#define M1_FLY 0x00000001L /* can fly or float */
#define M1_SWIM 0x00000002L /* can traverse water */
#define M1_AMORPHOUS 0x00000004L /* can flow under doors */
-#define M1_WALLWALK 0x00000008L /* can phase thru rock */
+#define M1_WALLWALK 0x00000008L /* can phase through rock */
#define M1_CLING 0x00000010L /* can cling to ceiling */
#define M1_TUNNEL 0x00000020L /* can tunnel thru rock */
#define M1_NEEDPICK 0x00000040L /* needs pick to tunnel */
@@ -144,7 +144,7 @@
#define M2_MAGIC 0x80000000L /* picks up magic items */
#endif
-#define M3_WANTSAMUL 0x0001 /* would like to steal the amulet */
+#define M3_WANTSAMUL 0x0001 /* would like to steal the Amulet */
#define M3_WANTSBELL 0x0002 /* wants the bell */
#define M3_WANTSBOOK 0x0004 /* wants the book */
#define M3_WANTSCAND 0x0008 /* wants the candelabrum */
@@ -186,7 +186,7 @@
#define G_SGROUP 0x0080 /* appear in small groups normally */
#define G_LGROUP 0x0040 /* appear in large groups normally */
#define G_GENO 0x0020 /* can be genocided */
-#define G_NOCORPSE 0x0010 /* no corpse left ever */
+#define G_NOCORPSE 0x0010 /* no corpse left, ever */
#define G_FREQ 0x0007 /* creation frequency mask */
/* for mvitals[].mvflags (variant during game), along with G_NOCORPSE */
diff -Ndur nethack-3.4.3/include/monst.h nethack-patched/include/monst.h
--- nethack-3.4.3/include/monst.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/monst.h 2006-04-27 21:03:52.000000000 +0000
@@ -5,7 +5,7 @@
#ifndef MONST_H
#define MONST_H
-/* The weapon_check flag is used two ways:
+/* The weapon_check flag is used in two ways:
* 1) When calling mon_wield_item, is 2-6 depending on what is desired.
* 2) Between calls to mon_wield_item, is 0 or 1 depending on whether or not
* the weapon is known by the monster to be cursed (so it shouldn't bother
@@ -27,7 +27,7 @@
* in invent.c:
*
* MINV_NOLET If set, don't display inventory letters on monster's inventory.
- * MINV_ALL If set, display all items in monster's inventory, otherwise
+ * MINV_ALL If set, display all items in monster's inventory; otherwise
* just display wielded weapons and worn items.
*/
#define MINV_NOLET 0x01
@@ -42,7 +42,7 @@
struct permonst *data;
unsigned m_id;
short mnum; /* permanent monster index number */
- short movement; /* movement points (derived from permonst definition and added effects */
+ short movement; /* movement points (derived from permonst definition and added effects) */
uchar m_lev; /* adjusted difficulty level of monster */
aligntyp malign; /* alignment of this monster, relative to the
player (positive = good to kill) */
@@ -67,8 +67,8 @@
Bitfield(minvis,1); /* currently invisible */
Bitfield(invis_blkd,1); /* invisibility blocked */
Bitfield(perminvis,1); /* intrinsic minvis value */
- Bitfield(cham,3); /* shape-changer */
-/* note: lychanthropes are handled elsewhere */
+ Bitfield(cham,3); /* shapechanger */
+/* note: lycanthropes are handled elsewhere */
#define CHAM_ORDINARY 0 /* not a shapechanger */
#define CHAM_CHAMELEON 1 /* animal */
#define CHAM_DOPPELGANGER 2 /* demi-human */
@@ -100,7 +100,7 @@
Bitfield(mstun,1); /* stunned (off balance) */
Bitfield(mconf,1); /* confused */
Bitfield(mpeaceful,1); /* does not attack unprovoked */
- Bitfield(mtrapped,1); /* trapped in a pit, web or bear trap */
+ Bitfield(mtrapped,1); /* trapped in a pit, web, or bear trap */
Bitfield(mleashed,1); /* monster is on a leash */
Bitfield(isshk,1); /* is shopkeeper */
Bitfield(isminion,1); /* is a minion */
diff -Ndur nethack-3.4.3/include/monsym.h nethack-patched/include/monsym.h
--- nethack-3.4.3/include/monsym.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/monsym.h 2006-04-27 21:07:14.000000000 +0000
@@ -6,9 +6,9 @@
#define MONSYM_H
/*
- * Monster classes. Below, are the corresponding default characters for
+ * Monster classes. Below are the corresponding default characters for
* them. Monster class 0 is not used or defined so we can use it as a
- * NULL character.
+ * null character.
*/
#define S_ANT 1
#define S_BLOB 2
diff -Ndur nethack-3.4.3/include/nhlan.h nethack-patched/include/nhlan.h
--- nethack-3.4.3/include/nhlan.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/nhlan.h 2006-04-27 21:08:20.000000000 +0000
@@ -38,7 +38,7 @@
struct lan_mail_struct {
char sender[120];
char subject[120];
- boolean body_in_ram; /* TRUE means body in memory not file */
+ boolean body_in_ram; /* TRUE means body in memory, not file */
char filename[_MAX_PATH];
char body[MAX_BODY_SIZE];
};
diff -Ndur nethack-3.4.3/include/ntconf.h nethack-patched/include/ntconf.h
--- nethack-3.4.3/include/ntconf.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/ntconf.h 2006-04-27 21:11:34.000000000 +0000
@@ -5,7 +5,7 @@
#ifndef NTCONF_H
#define NTCONF_H
-/* #define SHELL /* nt use of pcsys routines caused a hang */
+/* #define SHELL /* NT use of pcsys routines caused a hang */
#define RANDOM /* have Berkeley random(3) */
#define TEXTCOLOR /* Color text */
@@ -13,7 +13,7 @@
#define EXEPATH /* Allow .exe location to be used as HACKDIR */
#define TRADITIONAL_GLYPHMAP /* Store glyph mappings at level change time */
#ifdef WIN32CON
-#define LAN_FEATURES /* Include code for lan-aware features. Untested in 3.4.0*/
+#define LAN_FEATURES /* Include code for LAN-aware features. Untested in 3.4.0 */
#endif
#define PC_LOCKING /* Prevent overwrites of aborted or in-progress games */
@@ -121,7 +121,7 @@
#endif
#if defined(DLB)
-#define FILENAME_CMP stricmp /* case insensitive */
+#define FILENAME_CMP stricmp /* case-insensitive */
#endif
#if 0
diff -Ndur nethack-3.4.3/include/objclass.h nethack-patched/include/objclass.h
--- nethack-3.4.3/include/objclass.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/objclass.h 2006-05-04 00:07:04.000000000 +0000
@@ -13,7 +13,7 @@
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 */
@@ -145,7 +145,7 @@
#define ALL_CLASSES (MAXOCLASSES+2) /* input to getobj(). */
#define ALLOW_NONE (MAXOCLASSES+3) /* */
-#define BURNING_OIL (MAXOCLASSES+1) /* Can be used as input to explode. */
+#define BURNING_OIL (MAXOCLASSES+1) /* Can be used as input to explode */
#define MON_EXPLODE (MAXOCLASSES+2) /* Exploding monster (e.g. gas spore) */
#if 0 /* moved to decl.h so that makedefs.c won't see them */
@@ -153,7 +153,7 @@
extern uchar oc_syms[MAXOCLASSES]; /* current class symbols */
#endif
-/* Default definitions of all object-symbols (must match classes above). */
+/* Default definitions of all object symbols (must match classes above) */
#define ILLOBJ_SYM ']' /* also used for mimics */
#define WEAPON_SYM ')'
diff -Ndur nethack-3.4.3/include/pcconf.h nethack-patched/include/pcconf.h
--- nethack-3.4.3/include/pcconf.h 2005-11-18 23:34:10.000000000 +0000
+++ nethack-patched/include/pcconf.h 2006-05-04 00:14:32.000000000 +0000
@@ -12,8 +12,8 @@
/*
* Automatic Defines:
*
- * __GO32__ is defined automatically by the djgpp port of gcc.
- * __DJGPP__ is defined automatically by djgpp version 2 and above.
+ * __GO32__ is defined automatically by the DJGPP port of GCC.
+ * __DJGPP__ is defined automatically by DJGPP version 2 and above.
* _MSC_VER is defined automatically by Microsoft C.
* __BORLANDC__ is defined automatically by Borland C.
* __SC__ is defined automatically by Symantec C.
@@ -26,7 +26,7 @@
*/
/*
- * For pre-V7.0 Microsoft Compilers only, manually define OVERLAY here.
+ * For pre-V7.0 Microsoft compilers only, manually define OVERLAY here.
*/
/*#define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */
@@ -38,7 +38,7 @@
# define SHELL /* via exec of COMMAND.COM */
# ifdef __BORLANDC__
-#define PCMUSIC /* Music option, enable very basic pc speaker music notes */
+#define PCMUSIC /* Music option: enable very basic PC speaker music notes */
# endif
/*
@@ -52,7 +52,7 @@
*/
/* # define TERMLIB */ /* enable use of termcap file /etc/termcap */
- /* or ./termcap for MSDOS (SAC) */
+ /* or ./termcap for MS-DOS (SAC) */
/* compile and link in Fred Fish's termcap library, */
/* enclosed in TERMCAP.ARC, to use this */
@@ -63,7 +63,7 @@
# ifdef NO_TERMS /* if NO_TERMS select one screen package below */
#define SCREEN_BIOS /* Use bios calls for all screen control */
-/* #define SCREEN_DJGPPFAST */ /* Use djgpp fast screen routines */
+/* #define SCREEN_DJGPPFAST */ /* Use DJGPP fast screen routines */
# endif
@@ -80,7 +80,7 @@
# ifndef SUPPRESS_GRAPHICS
# if (defined(SCREEN_BIOS) || defined(SCREEN_DJGPPFAST)) && !defined(PC9800)
# ifdef USE_TILES
-#define SCREEN_VGA /* Include VGA graphics routines in the build */
+#define SCREEN_VGA /* Include VGA graphics routines in the build */
# endif
# endif
# else
@@ -95,7 +95,7 @@
# define RANDOM /* have Berkeley random(3) */
# define MAIL /* Allows for fake mail daemon to deliver mail */
- /* in the MSDOS version. (For AMIGA MAIL see */
+ /* in the MS-DOS version. (For AMIGA MAIL see */
/* amiconf.h). In the future this will be the */
/* hook for mail reader implementation. */
@@ -119,18 +119,18 @@
#endif
/*
- * On the VMS and unix, this option controls whether a delay is done by
+ * On VMS and Unix, this option controls whether a delay is done by
* the clock, or whether it is done by excess output. On the PC, however,
* there is always a clock to use for the delay. The TIMED_DELAY option
- * on MSDOS (without the termcap routines) is used to determine whether to
- * include the delay routines in the code (and thus, provides a compile time
+ * on MS-DOS (without the termcap routines) is used to determine whether to
+ * include the delay routines in the code (and thus, provides a compile-time
* method to turn off napping for visual effect). However, it is also used
* in the music code to wait between different notes. So it is needed in that
* case as well.
- * Whereas on the VMS and unix, flags.nap is a run-time option controlling
- * whether there is a delay by clock or by excess output, on MSDOS it is
- * simply a flag to turn on or off napping for visual effects at run-time.
+ * Whereas on VMS and Unix, flags.nap is a run-time option controlling
+ * whether there is a delay by clock or by excess output, on MS-DOS it is
+ * simply a flag to turn on or off napping for visual effects at runtime.
*/
#define TIMED_DELAY /* enable the `timed_delay' run-time option */
@@ -216,7 +216,7 @@
#endif
#ifdef RANDOM
-/* Use the high quality random number routines. */
+/* Use the high-quality random number routines. */
# define Rand() random()
#else
# define Rand() rand()
@@ -235,11 +235,11 @@
#ifdef MSDOS
# define TEXTCOLOR /* */
-# define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */
+# define PORT_HELP "msdoshlp.txt" /* MS-DOS port-specific help file */
#endif
-/* Sanity check, do not modify these blocks. */
+/* Sanity check; do not modify these blocks. */
/* OVERLAY must be defined with MOVERLAY or VROOMM */
#if (defined(MOVERLAY) || defined(VROOMM))
@@ -286,10 +286,10 @@
# if defined(_MSC_VER) || defined(__SC__)
# pragma message(" Forcing undef of SCREEN_DJGPPFAST")
# endif
-#undef SCREEN_DJGPPFAST /* Can't use djgpp fast with other compilers anyway */
+#undef SCREEN_DJGPPFAST /* Can't use DJGPP fast with other compilers anyway */
# endif
# else
-/* djgpp C compiler */
+/* DJGPP C compiler */
# if defined(SCREEN_BIOS)
#undef SCREEN_BIOS
# endif
@@ -309,14 +309,14 @@
# ifdef SCREEN_VGA
# define SIMULATE_CURSOR
# define POSITIONBAR
-/* Select appropriate tile file format, and map size */
+/* Select appropriate tile file format and map size */
# define PLANAR_FILE
# define SMALL_MAP
# endif
#endif /* End of sanity check block */
#if defined(MSDOS) && defined(DLB)
-#define FILENAME_CMP stricmp /* case insensitive */
+#define FILENAME_CMP stricmp /* case-insensitive */
#endif
#ifdef MSC7_WARN /* define with cl /DMSC7_WARN */
diff -Ndur nethack-3.4.3/include/qt_win.h nethack-patched/include/qt_win.h
--- nethack-3.4.3/include/qt_win.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/qt_win.h 2006-05-04 00:17:08.000000000 +0000
@@ -6,7 +6,7 @@
//
// Unfortunately, this doesn't use Qt as well as I would like,
// primarily because NetHack is fundamentally a getkey-type
-// program rather than being event driven (hence the ugly key
+// program rather than being event-driven (hence the ugly key
// and click buffer rather), but also because this is my first
// major application of Qt.
//
@@ -689,10 +689,10 @@
// This class is the main widget for NetHack
//
// It is a collection of Message, Map, and Status windows. In the current
-// version of nethack there is only one of each, and this class makes this
+// version of NetHack there is only one of each, and this class makes this
// assumption, not showing itself until all are inserted.
//
-// This class simply knows how to layout such children sensibly.
+// This class simply knows how to lay out such children sensibly.
//
// Since it is only responsible for layout, the class does not
// note the actual class of the windows.
diff -Ndur nethack-3.4.3/include/qtext.h nethack-patched/include/qtext.h
--- nethack-3.4.3/include/qtext.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/qtext.h 2006-05-04 00:18:04.000000000 +0000
@@ -53,7 +53,7 @@
/*
- * Quest message defines. Used in quest.c to trigger off "realistic"
+ * Quest message defines. Used in quest.c to trigger "realistic"
* dialogue to the player.
*/
#define QT_FIRSTTIME 1
diff -Ndur nethack-3.4.3/include/quest.h nethack-patched/include/quest.h
--- nethack-3.4.3/include/quest.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/quest.h 2006-05-04 00:19:32.000000000 +0000
@@ -13,7 +13,7 @@
Bitfield(got_quest,1); /* got the quest assignment */
Bitfield(first_locate,1); /* only set the first time */
- Bitfield(met_intermed,1); /* used if the locate is a person. */
+ Bitfield(met_intermed,1); /* used if the locate is a person */
Bitfield(got_final,1); /* got the final quest assignment */
Bitfield(made_goal,3); /* # of times on goal level */
diff -Ndur nethack-3.4.3/include/region.h nethack-patched/include/region.h
--- nethack-3.4.3/include/region.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/region.h 2006-05-04 00:21:04.000000000 +0000
@@ -12,7 +12,7 @@
/*
* Overload the old player_inside field with two values, coded in such
* a way as to retain compatibility with 3.4.0 save and bones files;
- * this relies on the fact that nethack's `boolean' is really stored
+ * this relies on the fact that NetHack's `boolean' is really stored
* in a `char' (or bigger type) rather than in a single bit.
*
* 3.4.1 save and bones files will be correct.
@@ -41,11 +41,11 @@
const char* leave_msg; /* Message when leaving */
short ttl; /* Time to live. -1 is forever */
short expire_f; /* Function to call when region's ttl expire */
- short can_enter_f; /* Function to call to check wether the player
- can, or can not, enter the region */
- short enter_f; /* Function to call when the player enters*/
- short can_leave_f; /* Function to call to check wether the player
- can, or can not, leave the region */
+ short can_enter_f; /* Function to call to check whether the player
+ can, or cannot, enter the region */
+ short enter_f; /* Function to call when the player enters */
+ short can_leave_f; /* Function to call to check whether the player
+ can, or cannot, leave the region */
short leave_f; /* Function to call when the player leaves */
short inside_f; /* Function to call every turn if player's
inside */
@@ -58,10 +58,10 @@
/* Should probably do the same thing about objects */
- boolean visible; /* Is the region visible ? */
+ boolean visible; /* Is the region visible? */
int glyph; /* Which glyph to use if visible */
genericptr_t arg; /* Optional user argument (Ex: strength of
- force field, damage of a fire zone, ...*/
+ force field, damage of a fire zone,...*/
} NhRegion;
#endif /* REGION_H */
diff -Ndur nethack-3.4.3/include/rm.h nethack-patched/include/rm.h
--- nethack-3.4.3/include/rm.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/rm.h 2006-05-09 16:49:42.000000000 +0000
@@ -11,7 +11,7 @@
* building on Don G. Kneller's MS-DOS implementation. See drawing.c for
* the code that permits the user to set the contents of the symbol structure.
*
- * The door representation was changed by Ari Huttunen(ahuttune@niksula.hut.fi)
+ * The door representation was changed by Ari Huttunen (ahuttune@niksula.hut.fi).
*/
/*
@@ -71,13 +71,13 @@
#define INVALID_TYPE 127
/*
- * Avoid using the level types in inequalities:
+ * Avoid using the level types in inequalities;
* these types are subject to change.
* Instead, use one of the macros below.
*/
#define IS_WALL(typ) ((typ) && (typ) <= DBWALL)
#define IS_STWALL(typ) ((typ) <= DBWALL) /* STONE <= (typ) <= DBWALL */
-#define IS_ROCK(typ) ((typ) < POOL) /* absolutely nonaccessible */
+#define IS_ROCK(typ) ((typ) < POOL) /* absolutely inaccessible */
#define IS_DOOR(typ) ((typ) == DOOR)
#define IS_TREE(typ) ((typ) == TREE || \
(level.flags.arboreal && (typ) == STONE))
@@ -180,7 +180,7 @@
#define S_digbeam 67 /* dig beam symbol */
#define S_flashbeam 68 /* camera flash symbol */
#define S_boomleft 69 /* thrown boomerang, open left, e.g ')' */
-#define S_boomright 70 /* thrown boomerand, open right, e.g. '(' */
+#define S_boomright 70 /* thrown boomerang, open right, e.g. '(' */
#define S_ss1 71 /* 4 magic shield glyphs */
#define S_ss2 72
#define S_ss3 73
@@ -247,7 +247,7 @@
#define D_TRAPPED 16
/*
- * Some altars are considered as shrines, so we need a flag.
+ * Some altars are considered shrines, so we need a flag.
*/
#define AM_SHRINE 8
@@ -289,7 +289,7 @@
#define S_LRING 4
/*
- * The four directions for a DrawBridge.
+ * The four directions for a drawbridge.
*/
#define DB_NORTH 0
#define DB_SOUTH 1
@@ -497,7 +497,7 @@
#define fmon level.monlist
/*
- * Covert a trap number into the defsym graphics array.
+ * Convert a trap number into a defsym graphics array index.
* Convert a defsym number into a trap number.
* Assumes that arrow trap will always be the first trap.
*/
diff -Ndur nethack-3.4.3/include/skills.h nethack-patched/include/skills.h
--- nethack-3.4.3/include/skills.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/skills.h 2006-05-10 21:11:24.000000000 +0000
@@ -14,10 +14,10 @@
#define P_NONE 0
/* Weapon Skills -- Stephen White
- * Order matters and are used in macros.
+ * Order matters and is used in macros.
* Positive values denote hand-to-hand weapons or launchers.
* Negative values denote ammunition or missiles.
- * Update weapon.c if you ammend any skills.
+ * Update weapon.c if you amend any skills.
* Also used for oc_subtyp.
*/
#define P_DAGGER 1
@@ -83,10 +83,10 @@
/*
* These are the standard weapon skill levels. It is important that
- * the lowest "valid" skill be be 1. The code calculates the
- * previous amount to practice by calling practice_needed_to_advance()
- * with the current skill-1. To work out for the UNSKILLED case,
- * a value of 0 needed.
+ * the lowest "valid" skill be 1. The code calculates the previous
+ * amount to practice by calling practice_needed_to_advance() with
+ * the current skill minus 1. To work out for the UNSKILLED case,
+ * a value of 0 is needed.
*/
#define P_ISRESTRICTED 0
#define P_UNSKILLED 1
@@ -98,7 +98,7 @@
#define practice_needed_to_advance(level) ((level)*(level)*20)
-/* The hero's skill in various weapons. */
+/* The hero's skill in various weapons */
struct skills {
xchar skill;
xchar max_skill;
diff -Ndur nethack-3.4.3/include/spell.h nethack-patched/include/spell.h
--- nethack-3.4.3/include/spell.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/spell.h 2006-05-10 21:12:00.000000000 +0000
@@ -8,7 +8,7 @@
struct spell {
short sp_id; /* spell id (== object.otyp) */
xchar sp_lev; /* power level */
- int sp_know; /* knowlege of spell */
+ int sp_know; /* knowledge of spell */
};
/* levels of memory destruction with a scroll of amnesia */
diff -Ndur nethack-3.4.3/include/system.h nethack-patched/include/system.h
--- nethack-3.4.3/include/system.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/system.h 2006-05-13 20:18:42.000000000 +0000
@@ -153,7 +153,7 @@
# else
E long FDECL(lseek, (int,off_t,int));
# endif
- /* Ultrix 3.0 man page mistakenly says it returns an int. */
+ /* Ultrix 3.0 man page mistakenly says it returns an int */
E int FDECL(write, (int,char *,int));
E int FDECL(link, (const char *, const char*));
# else
@@ -165,7 +165,7 @@
E int FDECL(write, (int, const void *,unsigned));
# endif
# else
-# ifndef __MWERKS__ /* metrowerks defines write via universal headers */
+# ifndef __MWERKS__ /* Metrowerks defines write via universal headers */
E int FDECL(write, (int,genericptr_t,unsigned));
# endif
# endif
diff -Ndur nethack-3.4.3/include/tosconf.h nethack-patched/include/tosconf.h
--- nethack-3.4.3/include/tosconf.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/tosconf.h 2006-05-13 20:21:00.000000000 +0000
@@ -38,7 +38,7 @@
#define SHELL /* allow spawning of shell */
#define TERMLIB /* use termcap */
#define TEXTCOLOR /* allow color */
-#define MAIL /* enable the fake maildemon */
+#define MAIL /* enable the fake mail daemon */
#ifdef MINT
#define SUSPEND /* allow suspending the game */
#endif
@@ -48,9 +48,9 @@
#endif
#if defined(__GNUC__) || defined(__MINT__)
-/* actually, only more recent GNU C libraries have strcmpi
- * on the other hand, they're free -- if yours is out of
- * date, grab the most recent from atari.archive.umich.edu
+/* Actually, only more recent GNU C libraries have strcmpi.
+ * On the other hand, they're free -- if yours is out of
+ * date, grab the most recent from atari.archive.umich.edu.
*/
#define STRNCMPI
#undef strcmpi
diff -Ndur nethack-3.4.3/include/tradstdc.h nethack-patched/include/tradstdc.h
--- nethack-3.4.3/include/tradstdc.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/tradstdc.h 2006-05-13 20:26:30.000000000 +0000
@@ -16,7 +16,7 @@
/*
* Borland C provides enough ANSI C compatibility in its Borland C++
* mode to warrant this. But it does not set __STDC__ unless it compiles
- * in its ANSI keywords only mode, which prevents use of <dos.h> and
+ * in its ANSI-keywords-only mode, which prevents use of <dos.h> and
* far pointer use.
*/
#if (defined(__STDC__) || defined(__TURBOC__)) && !defined(NOTSTDC)
@@ -25,7 +25,7 @@
#if defined(ultrix) && defined(__STDC__) && !defined(__LANGUAGE_C)
/* Ultrix seems to be in a constant state of flux. This check attempts to
- * set up ansi compatibility if it wasn't set up correctly by the compiler.
+ * set up ANSI compatibility if it wasn't set up correctly by the compiler.
*/
#ifdef mips
#define __mips mips
@@ -53,7 +53,7 @@
*/
/* #define USE_VARARGS */ /* use <varargs.h> instead of <stdarg.h> */
-/* #define USE_OLDARGS */ /* don't use any variable argument facilites */
+/* #define USE_OLDARGS */ /* don't use any variable argument facilities */
#if defined(apollo) /* Apollos have stdarg(3) but not stdarg.h */
# define USE_VARARGS
@@ -161,7 +161,7 @@
# endif
# endif
-#else /* NHSTDC */ /* a "traditional" C compiler */
+#else /* NHSTDC */ /* a "traditional" C compiler */
# define NDECL(f) f()
# define FDECL(f,p) f()
@@ -191,7 +191,7 @@
/*
* According to ANSI, prototypes for old-style declarations must widen the
- * arguments to int. However, the MSDOS compilers accept shorter arguments
+ * arguments to int. However, the MS-DOS compilers accept shorter arguments
* (char, short, etc.) in prototypes and do typechecking with them. Therefore
* this mess to allow the better typechecking while also allowing some
* prototypes for the ANSI compilers so people quit trying to fix the
diff -Ndur nethack-3.4.3/include/trap.h nethack-patched/include/trap.h
--- nethack-3.4.3/include/trap.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/trap.h 2006-05-13 20:26:56.000000000 +0000
@@ -22,7 +22,7 @@
Bitfield(once,1);
Bitfield(madeby_u,1); /* So monsters may take offence when you trap
them. Recognizing who made the trap isn't
- completely unreasonable, everybody has
+ completely unreasonable; everybody has
their own style. This flag is also needed
when you untrap a monster. It would be too
easy to make a monster peaceful if you could
diff -Ndur nethack-3.4.3/include/unixconf.h nethack-patched/include/unixconf.h
--- nethack-3.4.3/include/unixconf.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/unixconf.h 2006-05-13 20:33:26.000000000 +0000
@@ -12,7 +12,7 @@
* <sys/time.h> <time.h>
* <sgtty.h> <termio.h>
*
- * Some routines are called differently
+ * Some routines are named differently
* index strchr
* rindex strrchr
*
@@ -43,16 +43,16 @@
/* #define HISX */ /* Bull Unix for XPS Machines */
/* #define BOS */ /* Bull Open Software - Unix for DPX/2 Machines */
/* #define UNIXPC */ /* use in addition to SYSV for AT&T 7300/3B1 */
-/* #define AIX_31 */ /* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+/* #define AIX_31 */ /* In AIX 3.1 (IBM RS/6000) use BSD ioctls to gain
* job control (note that AIX is SYSV otherwise)
* Also define this for AIX 3.2 */
#define TERMINFO /* uses terminfo rather than termcap */
/* Should be defined for most SYSV, SVR4 (including
* Solaris 2+), HPUX, and Linux systems. In
- * particular, it should NOT be defined for the UNIXPC
+ * particular, it should NOT be defined for UNIXPC
* unless you remove the use of the shared library in
- * the Makefile */
+ * the makefile */
#define TEXTCOLOR /* Use System V r3.2 terminfo color support */
/* and/or ANSI color support on termcap systems */
/* and/or X11 color */
@@ -106,9 +106,9 @@
/*
- * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
+ * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more".
* If defined, it can be overridden by the environment variable PAGER.
- * Hack will use its internal pager if DEF_PAGER is not defined.
+ * NetHack will use its internal pager if DEF_PAGER is not defined.
* (This might be preferable for security reasons.)
* #define DEF_PAGER ".../mydir/mypager"
*/
@@ -126,7 +126,7 @@
#ifdef TTY_GRAPHICS
/*
* To enable the `timed_delay' option for using a timer rather than extra
- * screen output when pausing for display effect. Requires that `msleep'
+ * screen output when pausing for display effect. Requires that an `msleep'
* function be available (with time argument specified in milliseconds).
* Various output devices can produce wildly varying delays when the
* "extra output" method is used, but not all systems provide access to
@@ -147,7 +147,7 @@
/* The Andrew Message System does mail a little differently from normal
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
- * (another directory). MAILBOX is the element that will be added on to
+ * (another directory). MAILBOX is the element that will be added onto
* the user's home directory path to generate the Mailbox path - just in
* case other Andrew sites do it differently from CMU.
*
@@ -157,8 +157,8 @@
/* #define AMS */ /* use Andrew message system for mail */
-/* NO_MAILREADER is for kerberos authenticating filesystems where it is
- * essentially impossible to securely exec child processes, like mail
+/* NO_MAILREADER is for Kerberos authenticating filesystems where it is
+ * essentially impossible to securely exec child processes, such as mail
* readers, when the game is running under a special token.
*
* dan
@@ -300,7 +300,7 @@
# endif
#endif
-/* Use the high quality random number routines. */
+/* Use the high-quality random number routines. */
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) || defined(RANDOM) || defined(__APPLE__)
#define Rand() random()
#else
diff -Ndur nethack-3.4.3/include/vision.h nethack-patched/include/vision.h
--- nethack-3.4.3/include/vision.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/vision.h 2006-05-13 20:35:46.000000000 +0000
@@ -1,5 +1,5 @@
/* SCCS Id: @(#)vision.h 3.4 1995/01/26 */
-/* Copyright (c) Dean Luick, with acknowledgements to Dave Cohrs, 1990. */
+/* Copyright (c) Dean Luick, with acknowledgments to Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
#ifndef VISION_H
@@ -7,9 +7,9 @@
#if 0 /* (moved to decl.h) */
extern boolean vision_full_recalc; /* TRUE if need vision recalc */
-extern char **viz_array; /* could see/in sight row pointers */
-extern char *viz_rmin; /* min could see indices */
-extern char *viz_rmax; /* max could see indices */
+extern char **viz_array; /* could_see/in_sight row pointers */
+extern char *viz_rmin; /* min could_see indices */
+extern char *viz_rmax; /* max could_see indices */
#endif
#define COULD_SEE 0x1 /* location could be seen, if it were lit */
#define IN_SIGHT 0x2 /* location can be seen */
@@ -38,8 +38,8 @@
*
* m_canseeu() - Returns true if the monster could see the hero. Assumes
* that if the hero has a clear line of sight to the monster's
- * location and the hero is visible, then monster can see the
- * hero.
+ * location and the hero is visible, then the monster can see
+ * the hero.
*/
#define m_cansee(mtmp,x2,y2) clear_path((mtmp)->mx,(mtmp)->my,(x2),(y2))
diff -Ndur nethack-3.4.3/include/vmsconf.h nethack-patched/include/vmsconf.h
--- nethack-3.4.3/include/vmsconf.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/vmsconf.h 2006-05-13 20:42:08.000000000 +0000
@@ -10,7 +10,7 @@
* Edit these to choose values appropriate for your site.
* WIZARD is the username allowed to use the debug option of nethack; no harm
* is done by leaving it as a username that doesn't exist at your site.
- * HACKDIR can be overridden at run-time with the logical name HACKDIR, as in
+ * HACKDIR can be overridden at runtime with the logical name HACKDIR, as in
* $ define hackdir disk$users:[games.nethack]
* Trailing NULs are present in the default values in order to make some
* extra room for patching longer values into an existing executable.
@@ -80,16 +80,16 @@
* a number between 40 and 47 represented background color, and the second
* # is a number between 30 and 37 representing the foreground color.
* GIGI terminals and DECterm windows on color VAXstations support these
- * color escape sequences, as do some 3rd party terminals and many micro
- * computers.
+ * color escape sequences, as do some third-party terminals and many
+ * microcomputers.
*/
/* #define TEXTCOLOR */
/*
* If you define USE_QIO_INPUT, then you'll get raw characters from the
- * keyboard, not unlike those of the unix version of Nethack. This will
+ * keyboard, not unlike those of the Unix version of Nethack. This will
* allow you to use the Escape key in normal gameplay, and the appropriate
- * control characters in Wizard mode. It will work most like the unix version.
+ * control characters in Wizard mode. It will work most like the Unix version.
* It will also avoid "<interrupt>" being displayed when ^Y is pressed.
*
* Otherwise, the VMS SMG calls will be used. These calls block use of
@@ -143,11 +143,11 @@
#ifdef DLB
# define DLBFILE "nh-data.dlb"
/*
- * Since we can do without case insensitive filename comparison,
+ * Since we can do without case-insensitive filename comparison,
* avoid enabling it because that requires compiling and linking
* src/hacklib into util/dlb_main.
*/
-/* # define FILENAME_CMP strcmpi */ /* case insensitive */
+/* # define FILENAME_CMP strcmpi */ /* case-insensitive */
#endif
#if defined(VAXC) && !defined(ANCIENT_VAXC)
@@ -167,7 +167,7 @@
#endif
#ifndef alloca
- /* bison generated foo_yacc.c might try to use alloca() */
+ /* bison-generated foo_yacc.c might try to use alloca() */
# ifdef __GNUC__
# define alloca __builtin_alloca
# else
@@ -217,7 +217,7 @@
#define index strchr
#define rindex strrchr
-/* Use the high quality random number routines. */
+/* Use the high-quality random number routines. */
#if defined(RANDOM)
#define Rand() random()
/* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied
@@ -249,7 +249,7 @@
#endif
#define C$$TRANSLATE(n) c__translate(n) /* vmsfiles.c */
-/* VMS global names are case insensitive... */
+/* VMS global names are case-insensitive... */
#define An vms_an
#define The vms_the
#define Shk_Your vms_shk_your
diff -Ndur nethack-3.4.3/include/wceconf.h nethack-patched/include/wceconf.h
--- nethack-3.4.3/include/wceconf.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/wceconf.h 2006-05-13 20:45:38.000000000 +0000
@@ -11,7 +11,7 @@
#include <windows.h>
-/* Detect the targe device */
+/* Detect the target device */
#if defined(WIN32_PLATFORM_PSPC)
# if _WIN32_WCE >= 300
# define WIN_CE_POCKETPC
@@ -26,7 +26,7 @@
# error "Unsupported Windows CE platform"
#endif
-/* #define SHELL /* nt use of pcsys routines caused a hang */
+/* #define SHELL /* NT use of pcsys routines caused a hang */
#define RANDOM /* have Berkeley random(3) */
#define TEXTCOLOR /* Color text */
@@ -104,8 +104,8 @@
# error Only ARM, PPC, ALPHA, SH3, SH4, MIPS and X86 supported
#endif
-#define RUNTIME_PORT_ID /* trigger run-time port identification since
- Makedefs is bootstrapped on a cross-platform. */
+#define RUNTIME_PORT_ID /* trigger runtime port identification since
+ Makedefs is bootstrapped on a cross-platform */
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
#ifdef STRNCMPI
@@ -137,7 +137,7 @@
#define rindex strrchr
#define USE_STDARG
#ifdef RANDOM
-/* Use the high quality random number routines. */
+/* Use the high-quality random number routines. */
#define Rand() random()
#else
#define Rand() rand()
@@ -157,7 +157,7 @@
#endif
#if defined(DLB)
-#define FILENAME_CMP _stricmp /* case insensitive */
+#define FILENAME_CMP _stricmp /* case-insensitive */
#endif
#if 0
@@ -245,7 +245,7 @@
/* __time.h___ */
#ifndef _TIME_T_DEFINED
typedef __int64 time_t; /* time value */
-#define _TIME_T_DEFINED /* avoid multiple def's of time_t */
+#define _TIME_T_DEFINED /* avoid multiple definitions of time_t */
#endif
#ifndef _TM_DEFINED
@@ -344,9 +344,9 @@
# undef ARM
# endif
-/* leave - Windows CE defines leave as part of exception handling (__leave)
- It confilicts with existing sources and since we don't use exceptions it is safe
- to undefine it */
+/* leave - Windows CE defines leave as part of exception handling (__leave).
+ It conflicts with existing sources and since we don't use exceptions it is safe
+ to undefine it. */
# ifdef leave
# undef leave
# endif
diff -Ndur nethack-3.4.3/include/winX.h nethack-patched/include/winX.h
--- nethack-3.4.3/include/winX.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/winX.h 2006-05-13 20:54:36.000000000 +0000
@@ -136,8 +136,8 @@
int count; /* Number of strings. */
String *list_pointer;/* String list. */
Boolean *sensitive; /* Active list. */
- char curr_selector;/* Next keyboard accelerator to assign, */
- /* if 0, then we're out. */
+ char curr_selector;/* Next keyboard accelerator to assign; */
+ /* if it's 0, then we're out. */
};
struct menu_info_t {
@@ -153,7 +153,7 @@
boolean valid_widgets; /* TRUE if widgets have been created. */
boolean is_menu; /* Has been confirmed to being a menu window. */
boolean is_active; /* TRUE when waiting for user input. */
- boolean is_up; /* TRUE when window is popped-up. */
+ boolean is_up; /* TRUE when window is popped up. */
boolean cancelled; /* Menu has been explicitly cancelled. */
boolean counting; /* true when menu_count has a valid value */
};
@@ -168,7 +168,7 @@
int extra_width, /* Sum of left and right border widths. */
extra_height; /* Sum of top and bottom border widths. */
boolean blocked; /* */
- boolean destroy_on_ack; /* Destroy this window when acknowleged. */
+ boolean destroy_on_ack; /* Destroy this window when acknowledged. */
#ifdef GRAPHIC_TOMBSTONE
boolean is_rip; /* This window needs a tombstone. */
#endif
@@ -179,7 +179,7 @@
* Basic window structure.
*/
struct xwindow {
- int type; /* type of nethack window */
+ int type; /* type of NetHack window */
Widget popup; /* direct parent of widget w or viewport */
Widget w; /* the widget that does things */
Dimension pixel_width; /* window size, in pixels */
@@ -210,13 +210,13 @@
#define NHW_NONE 0 /* Unallocated window type. Must be */
/* different from any other NHW_* type. */
-#define NO_CLICK 0 /* No click occured on the map window. Must */
- /* be different than CLICK_1 and CLICK_2. */
+#define NO_CLICK 0 /* No click occurred on the map window. Must */
+ /* be different from CLICK_1 and CLICK_2. */
#define DEFAULT_MESSAGE_WIDTH 60/* width in chars of the message window */
#define DISPLAY_FILE_SIZE 35 /* Max number of lines in the default */
- /* file display window. */
+ /* file display window */
#define MAX_KEY_STRING 64 /* String size for converting a keypress */
/* event into a character(s) */
@@ -228,7 +228,7 @@
/* Window variables (winX.c). */
E struct xwindow window_list[MAX_WINDOWS];
E XtAppContext app_context; /* context of application */
-E Widget toplevel; /* toplevel widget */
+E Widget toplevel; /* top-level widget */
E Atom wm_delete_window; /* delete window protocol */
E boolean exit_x_event; /* exit condition for event loop */
#define EXIT_ON_KEY_PRESS 0 /* valid values for exit_x_event */
@@ -251,8 +251,8 @@
String tombstone; /* name of XPM file for tombstone */
int tombtext_x; /* x-coord of center of first tombstone text */
int tombtext_y; /* y-coord of center of first tombstone text */
- int tombtext_dx; /* x-displacement between tombstone line */
- int tombtext_dy; /* y-displacement between tombstone line */
+ int tombtext_dx; /* x-displacement between tombstone lines */
+ int tombtext_dy; /* y-displacement between tombstone lines */
#endif
} AppResources;
@@ -261,7 +261,7 @@
extern struct window_procs X11_procs;
-/* Check for an invalid window id. */
+/* Check for an invalid window ID. */
#define check_winid(window) \
if ((window) < 0 || (window) >= MAX_WINDOWS) { \
panic("illegal windid [%d] in %s at line %d", \
@@ -398,7 +398,7 @@
E void FDECL(X11_number_pad, (int));
E void NDECL(X11_delay_output);
-/* other defs that really should go away (they're tty specific) */
+/* other defs that really should go away (they're TTY-specific) */
E void NDECL(X11_start_screen);
E void NDECL(X11_end_screen);
diff -Ndur nethack-3.4.3/include/winami.h nethack-patched/include/winami.h
--- nethack-3.4.3/include/winami.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/winami.h 2006-05-13 22:31:18.000000000 +0000
@@ -18,19 +18,19 @@
long glyph; /* Glyph for menu item */
long count; /* Object count */
char selected; /* Been selected? */
- char selector; /* Char used to select this entry. */
+ char selector; /* Char used to select this entry */
char gselector; /* Group selector */
- char canselect; /* Can user select this entry. */
- char attr; /* Attribute for the line. */
- char *str; /* The text of the item. */
+ char canselect; /* Can user select this entry? */
+ char attr; /* Attribute for the line */
+ char *str; /* The text of the item */
} amii_menu_item;
struct amii_menu
{
- amii_menu_item *items; /* Starting pointer for item list. */
- amii_menu_item *last; /* End pointer for item list. */
+ amii_menu_item *items; /* Starting pointer for item list */
+ amii_menu_item *last; /* End pointer for item list */
const char *query; /* Query string */
- int count; /* Number of strings. */
+ int count; /* Number of strings */
char chr; /* Character to assign for accelerator */
};
@@ -53,7 +53,7 @@
char **data; /* window data [row][column] */
menu_item *mi; /* Menu information */
char *resp; /* valid menu responses (for NHW_INVEN) */
- char *canresp; /* cancel responses; 1st is the return value */
+ char *canresp; /* cancel responses; first is the return value */
char *morestr; /* string to display instead of default */
/* amiga stuff */
struct Window *win; /* Intuition window pointer */
@@ -73,13 +73,13 @@
#define FLMAP_SKIP 4
#define FLMSG_FIRST 1 /* First message in the NHW_MESSAGE window for this turn */
long wflags;
- short cursx, cursy; /* Where the cursor is displayed at */
- short curs_apen, /* Color cursor is displayed in */
+ short cursx, cursy; /* Where the cursor is displayed */
+ short curs_apen, /* Color in which cursor is displayed */
curs_bpen;
};
/* descriptor for intuition-based displays -- all the per-display data */
-/* this is a generic thing - think of it as Screen level */
+/* This is a generic thing; think of it as Screen level. */
struct amii_DisplayDesc {
/* we need this for Screen size (which will vary with display mode) */
@@ -109,7 +109,7 @@
#define MAXWIN 20 /* maximum number of windows, cop-out */
-/* port specific variable declarations */
+/* port-specific variable declarations */
extern winid WIN_BASE;
extern winid WIN_OVER;
#define NHW_BASE 6
diff -Ndur nethack-3.4.3/include/winprocs.h nethack-patched/include/winprocs.h
--- nethack-3.4.3/include/winprocs.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/winprocs.h 2006-05-13 22:32:26.000000000 +0000
@@ -59,7 +59,7 @@
char * NDECL((*win_get_color_string));
#endif
- /* other defs that really should go away (they're tty specific) */
+ /* other defs that really should go away (they're TTY-specific) */
void NDECL((*win_start_screen));
void NDECL((*win_end_screen));
@@ -70,7 +70,7 @@
extern NEARDATA struct window_procs windowprocs;
/*
- * If you wish to only support one window system and not use procedure
+ * If you wish to support only one window system and not use procedure
* pointers, add the appropriate #ifdef below.
*/
@@ -128,7 +128,7 @@
*/
/* #define yn_function (*windowprocs.win_yn_function) */
-/* other defs that really should go away (they're tty specific) */
+/* other defs that really should go away (they're TTY-specific) */
#define start_screen (*windowprocs.win_start_screen)
#define end_screen (*windowprocs.win_end_screen)
@@ -138,7 +138,7 @@
/*
* WINCAP
* Window port preference capability bits.
- * Some day this might be better in its own wincap.h file.
+ * Someday this might be better in its own wincap.h file.
*/
#define WC_COLOR 0x01L /* 01 Port can display things in color */
#define WC_HILITE_PET 0x02L /* 02 supports hilite pet */
diff -Ndur nethack-3.4.3/include/wintty.h nethack-patched/include/wintty.h
--- nethack-3.4.3/include/wintty.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/wintty.h 2006-05-13 22:36:30.000000000 +0000
@@ -1,5 +1,5 @@
/* SCCS Id: @(#)wintty.h 3.4 1996/02/18 */
-/* Copyright (c) David Cohrs, 1991,1992 */
+/* Copyright (c) David Cohrs, 1991, 1992 */
/* NetHack may be freely redistributed. See license for details. */
#ifndef WINTTY_H
@@ -22,12 +22,12 @@
char gselector; /* group accelerator */
} tty_menu_item;
-/* descriptor for tty-based windows */
+/* descriptor for TTY-based windows */
struct WinDesc {
int flags; /* window flags */
xchar type; /* type of window */
boolean active; /* true if window is active */
- uchar offx, offy; /* offset from topleft of display */
+ uchar offx, offy; /* offset from top left of display */
short rows, cols; /* dimensions */
short curx, cury; /* current cursor position */
short maxrow, maxcol; /* the maximum size used -- for MENU wins */
@@ -49,9 +49,9 @@
#define WIN_CANCELLED 1
#define WIN_STOP 1 /* for NHW_MESSAGE; stops output */
-/* descriptor for tty-based displays -- all the per-display data */
+/* descriptor for TTY-based displays -- all the per-display data */
struct DisplayDesc {
- uchar rows, cols; /* width and height of tty display */
+ uchar rows, cols; /* width and height of TTY display */
uchar curx, cury; /* current cursor position on the screen */
#ifdef TEXTCOLOR
int color; /* current color */
@@ -70,7 +70,7 @@
#define MAXWIN 20 /* maximum number of windows, cop-out */
-/* tty dependent window types */
+/* TTY-dependent window types */
#ifdef NHW_BASE
#undef NHW_BASE
#endif
@@ -83,12 +83,12 @@
extern struct WinDesc *wins[MAXWIN];
-extern struct DisplayDesc *ttyDisplay; /* the tty display descriptor */
+extern struct DisplayDesc *ttyDisplay; /* the TTY display descriptor */
extern char morc; /* last character typed to xwaitforspace */
extern char defmorestr[]; /* default --more-- prompt */
-/* port specific external function references */
+/* port-specific external function references */
/* ### getline.c ### */
E void FDECL(xwaitforspace, (const char *));
@@ -102,9 +102,9 @@
#if defined(apollo)
/* Apollos don't widen old-style function definitions properly -- they try to
* be smart and use the prototype, or some such strangeness. So we have to
- * define UNWIDENDED_PROTOTYPES (in tradstdc.h), which makes CHAR_P below a
+ * define UNWIDENED_PROTOTYPES (in tradstdc.h), which makes CHAR_P below a
* char. But the tputs termcap call was compiled as if xputc's argument
- * actually would be expanded. So here, we have to make an exception. */
+ * actually would be expanded. So here we have to make an exception. */
E void FDECL(xputc, (int));
#else
E void FDECL(xputc, (CHAR_P));
@@ -216,7 +216,7 @@
E char * NDECL(tty_get_color_string);
#endif
-/* other defs that really should go away (they're tty specific) */
+/* other defs that really should go away (they're TTY-specific) */
E void NDECL(tty_start_screen);
E void NDECL(tty_end_screen);
diff -Ndur nethack-3.4.3/include/wintype.h nethack-patched/include/wintype.h
--- nethack-3.4.3/include/wintype.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/wintype.h 2006-05-13 22:37:10.000000000 +0000
@@ -32,7 +32,7 @@
#define PICK_ANY 2 /* can pick any amount */
/* window types */
-/* any additional port specific types should be defined in win*.h */
+/* any additional port-specific types should be defined in win*.h */
#define NHW_MESSAGE 1
#define NHW_STATUS 2
#define NHW_MAP 3
diff -Ndur nethack-3.4.3/include/you.h nethack-patched/include/you.h
--- nethack-3.4.3/include/you.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/you.h 2006-05-13 22:57:46.000000000 +0000
@@ -96,7 +96,7 @@
short questarti; /* index (ART_) of quest artifact (questpgr.c) */
/*** Bitmasks ***/
- short allow; /* bit mask of allowed variations */
+ short allow; /* bitmask of allowed variations */
#define ROLE_RACEMASK 0x0ff8 /* allowable races */
#define ROLE_GENDMASK 0xf000 /* allowable genders */
#define ROLE_MALE 0x1000
@@ -121,7 +121,7 @@
int spelshld; /* penalty for wearing any shield */
int spelarmr; /* penalty for wearing metal armour */
int spelstat; /* which stat (A_) is used */
- int spelspec; /* spell (SPE_) the class excels at */
+ int spelspec; /* spell (SPE_) at which the class excels */
int spelsbon; /* penalty (-bonus) for that spell */
/*** Properties in variable-length arrays ***/
@@ -164,10 +164,10 @@
zombienum; /* PM_ as a zombie */
/*** Bitmasks ***/
- short allow; /* bit mask of allowed variations */
+ short allow; /* bitmask of allowed variations */
short selfmask, /* your own race's bit mask */
- lovemask, /* bit mask of always peaceful */
- hatemask; /* bit mask of always hostile */
+ lovemask, /* bitmask of always peaceful */
+ hatemask; /* bitmask of always hostile */
/*** Attributes ***/
xchar attrmin[A_MAX]; /* minimum allowable attribute */
@@ -272,7 +272,7 @@
/* These ranges can never be more than MAX_RANGE (vision.h). */
int nv_range; /* current night vision range */
- int xray_range; /* current xray vision range */
+ int xray_range; /* current X-ray vision range */
/*
* These variables are valid globally only when punished and blind.
@@ -309,10 +309,10 @@
struct u_event uevent; /* certain events have happened */
struct u_have uhave; /* you're carrying special objects */
struct u_conduct uconduct; /* KMH, conduct */
- struct attribs acurr, /* your current attributes (eg. str)*/
+ struct attribs acurr, /* your current attributes (e.g., str)*/
aexe, /* for gain/loss via "exercise" */
- abon, /* your bonus attributes (eg. str) */
- amax, /* your max attributes (eg. str) */
+ abon, /* your bonus attributes (e.g., str) */
+ amax, /* your max attributes (e.g., str) */
atemp, /* used for temporary loss/gain */
atime; /* used for loss/gain countdown */
align ualign; /* character alignment */
@@ -322,15 +322,15 @@
aligntyp ualignbase[CONVERT]; /* for ualign conversion record */
schar uluck, moreluck; /* luck and luck bonus */
#define Luck (u.uluck + u.moreluck)
-#define LUCKADD 3 /* added value when carrying luck stone */
+#define LUCKADD 3 /* added value when carrying luckstone */
#define LUCKMAX 10 /* on moonlit nights 11 */
#define LUCKMIN (-10)
schar uhitinc;
schar udaminc;
schar uac;
uchar uspellprot; /* protection by SPE_PROTECTION */
- uchar usptime; /* #moves until uspellprot-- */
- uchar uspmtime; /* #moves between uspellprot-- */
+ uchar usptime; /* # moves until uspellprot-- */
+ uchar uspmtime; /* # moves between uspellprot-- */
int uhp,uhpmax;
int uen, uenmax; /* magical energy - M. Stephenson */
int ugangr; /* if the gods are angry at you */
@@ -353,7 +353,7 @@
#endif
int umortality; /* how many times you died */
int ugrave_arise; /* you die and become something aside from a ghost */
- time_t ubirthday; /* real world time when game began */
+ time_t ubirthday; /* real-world time when game began */
int weapon_slots; /* unused skill slots */
int skills_advanced; /* # of advances made so far */
diff -Ndur nethack-3.4.3/include/youprop.h nethack-patched/include/youprop.h
--- nethack-3.4.3/include/youprop.h 2005-11-18 23:34:12.000000000 +0000
+++ nethack-patched/include/youprop.h 2006-05-13 20:50:06.000000000 +0000
@@ -15,7 +15,7 @@
* Reorganized and rewritten for >32-bit properties.
* HXxx refers to intrinsic bitfields while in human form.
* EXxx refers to extrinsic bitfields from worn objects.
- * BXxx refers to the cause of the property being blocked.
+ * BXxx refers to the property's being blocked.
* Xxx refers to any source, including polymorph forms.
*/
@@ -255,7 +255,7 @@
# define Swimming (HSwimming || ESwimming || \
is_swimmer(youmonst.data))
#endif
- /* Get wet, don't go under water unless if amphibious */
+ /* Get wet, don't go under water unless amphibious */
#define HMagical_breathing u.uprops[MAGICAL_BREATHING].intrinsic
#define EMagical_breathing u.uprops[MAGICAL_BREATHING].extrinsic
diff -Ndur nethack-3.4.3/out nethack-patched/out
--- nethack-3.4.3/out 2006-03-28 17:25:14.000000000 +0000
+++ nethack-patched/out 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-File '*.c' could not be opened.
diff -Ndur nethack-3.4.3/src/apply.c nethack-patched/src/apply.c
--- nethack-3.4.3/src/apply.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/apply.c 2006-03-28 17:37:42.000000000 +0000
@@ -1126,7 +1126,7 @@
/*
* Free & add to re-merge potion. This will average the
* age of the potions. Not exactly the best solution,
- * but its easy.
+ * but it's easy.
*/
freeinv(obj);
(void) addinv(obj);
@@ -1649,7 +1649,7 @@
if (cansee_spot && !silent) {
struct monst *mon;
mon = figurine->ocarry;
- /* figurine carring monster might be invisible */
+ /* figurine carrying monster might be invisible */
if (canseemon(figurine->ocarry)) {
Sprintf(carriedby, "%s pack",
s_suffix(a_monnam(mon)));
diff -Ndur nethack-3.4.3/src/artifact.c nethack-patched/src/artifact.c
--- nethack-3.4.3/src/artifact.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/artifact.c 2006-03-28 17:46:04.000000000 +0000
@@ -251,7 +251,7 @@
return((boolean)(arti && (arti->spfx & abil)));
}
-/* used so that callers don't need to known about SPFX_ codes */
+/* used so that callers don't need to know about SPFX_ codes */
boolean
confers_luck(obj)
struct obj *obj;
@@ -503,7 +503,7 @@
if(!oart) return 1;
yours = (mon == &youmonst);
- /* all quest artifacts are self-willed; it this ever changes, `badclass'
+ /* all quest artifacts are self-willed; if this ever changes, `badclass'
will have to be extended to explicitly include quest artifacts */
self_willed = ((oart->spfx & SPFX_INTEL) != 0);
if (yours) {
@@ -785,7 +785,7 @@
/* the special effects also boost physical damage; increments are
generally cumulative, but since the stun effect is based on a
- different criterium its damage might not be included; the base
+ different criterion its damage might not be included; the base
damage is either 1d4 (athame) or 2d4 (athame+spec_dbon) depending
on target's resistance check against AD_STUN (handled by caller)
[note that a successful save against AD_STUN doesn't actually
diff -Ndur nethack-3.4.3/src/attrib.c nethack-patched/src/attrib.c
--- nethack-3.4.3/src/attrib.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/attrib.c 2006-03-28 17:46:22.000000000 +0000
@@ -206,7 +206,7 @@
int
stone_luck(parameter)
-boolean parameter; /* So I can't think up of a good name. So sue me. --KAA */
+boolean parameter; /* So I can't think up a good name. So sue me. --KAA */
{
register struct obj *otmp;
register long bonchance = 0;
diff -Ndur nethack-3.4.3/src/cmd.c nethack-patched/src/cmd.c
--- nethack-3.4.3/src/cmd.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/cmd.c 2006-03-28 20:13:36.000000000 +0000
@@ -243,7 +243,7 @@
}
char
-pgetchar() { /* curtesy of aeb@cwi.nl */
+pgetchar() { /* courtesy of aeb@cwi.nl */
register int ch;
if(!(ch = popch()))
diff -Ndur nethack-3.4.3/src/detect.c nethack-patched/src/detect.c
--- nethack-3.4.3/src/detect.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/detect.c 2006-05-13 20:21:48.000000000 +0000
@@ -542,7 +542,7 @@
temp.otyp = mtmp->mappearance; /* needed for obj_to_glyph() */
temp.ox = mtmp->mx;
temp.oy = mtmp->my;
- temp.corpsenm = PM_TENGU; /* if mimicing a corpse */
+ temp.corpsenm = PM_TENGU; /* if mimicking a corpse */
map_object(&temp, 1);
#ifndef GOLDOBJ
} else if (mtmp->mgold && (!class || class == COIN_CLASS)) {
@@ -1160,7 +1160,7 @@
register int aflag;
{
#ifdef GCC_BUG
-/* some versions of gcc seriously muck up nested loops. if you get strange
+/* Some versions of gcc seriously muck up nested loops. If you get strange
crashes while searching in a version compiled with gcc, try putting
#define GCC_BUG in *conf.h (or adding -DGCC_BUG to CFLAGS in the
makefile).
diff -Ndur nethack-3.4.3/src/dig.c nethack-patched/src/dig.c
--- nethack-3.4.3/src/dig.c 2005-11-18 23:36:44.000000000 +0000
+++ nethack-patched/src/dig.c 2006-03-28 20:36:46.000000000 +0000
@@ -1298,7 +1298,7 @@
otmp2 = otmp->nexthere;
/*
* obj_resists(,0,0) prevents Rider corpses from being buried.
- * It also prevents The Amulet and invocation tools from being
+ * It also prevents the Amulet and invocation tools from being
* buried. Since they can't be confined to bags and statues,
* it makes sense that they can't be buried either, even though
* the real reason there (direct accessibility when carried) is
diff -Ndur nethack-3.4.3/src/display.c nethack-patched/src/display.c
--- nethack-3.4.3/src/display.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/display.c 2006-03-29 02:32:42.000000000 +0000
@@ -367,10 +367,10 @@
register int sensed = mon_mimic &&
(Protection_from_shape_changers || sensemon(mon));
/*
- * We must do the mimic check first. If the mimic is mimicing something,
+ * We must do the mimic check first. If the mimic is mimicking something,
* and the location is in sight, we have to change the hero's memory
* so that when the position is out of sight, the hero remembers what
- * the mimic was mimicing.
+ * the mimic was mimicking.
*/
if (mon_mimic && (sightflags == PHYSICALLY_SEEN)) {
@@ -404,7 +404,7 @@
obj.ox = x;
obj.oy = y;
obj.otyp = mon->mappearance;
- obj.corpsenm = PM_TENGU; /* if mimicing a corpse */
+ obj.corpsenm = PM_TENGU; /* if mimicking a corpse */
map_object(&obj,!sensed);
break;
}
@@ -416,7 +416,7 @@
}
- /* If the mimic is unsucessfully mimicing something, display the monster */
+ /* If the mimic is unsucessfully mimicking something, display the monster */
if (!mon_mimic || sensed) {
int num;
@@ -500,7 +500,7 @@
*/
if (glyph_is_invisible(levl[x][y].glyph) && m_at(x,y)) return;
- /* The hero can't feel non pool locations while under water. */
+ /* The hero can't feel non-pool locations while under water. */
if (Underwater && !Is_waterlevel(&u.uz) && ! is_pool(x,y))
return;
@@ -1079,7 +1079,7 @@
}
/*
- * Block/unblock light depending on what a mimic is mimicing and if it's
+ * Block/unblock light depending on what a mimic is mimicking and if it's
* invisible or not. Should be called only when the state of See_invisible
* changes.
*/
@@ -1581,10 +1581,10 @@
#endif /* WA_VERBOSE */
/*
- * Return 'which' if position is implies an unfinshed exterior. Return
+ * Return 'which' if position implies an unfinished exterior. Return
* zero otherwise. Unfinished implies outer area is rock or a corridor.
*
- * Things that are ambigious: lava
+ * Things that are ambiguous: lava
*/
STATIC_OVL int
check_pos(x, y, which)
@@ -1852,7 +1852,7 @@
* 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
@@ -1889,7 +1889,7 @@
/*
* Return the correct graphics character index using wall type, wall mode,
- * and the seen vector. It is expected that seenv is non zero.
+ * and the seen vector. It is expected that seenv is non-zero.
*
* All T-wall vectors are rotated to be TDWALL. All single crosswall
* blocks are rotated to bottom right. All double crosswall are rotated
diff -Ndur nethack-3.4.3/src/do_name.c nethack-patched/src/do_name.c
--- nethack-3.4.3/src/do_name.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/do_name.c 2006-03-29 02:44:14.000000000 +0000
@@ -930,7 +930,7 @@
"aardvark", /* Cerebus */
"Audrey II", /* Little Shop of Horrors */
"witch doctor", "one-eyed one-horned flying purple people eater",
- /* 50's rock 'n' roll */
+ /* '50s rock 'n' roll */
"Barney the dinosaur", /* saccharine kiddy TV */
"Morgoth", /* Angband */
"Vorlon", /* Babylon 5 */
diff -Ndur nethack-3.4.3/src/do_wear.c nethack-patched/src/do_wear.c
--- nethack-3.4.3/src/do_wear.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/do_wear.c 2006-03-29 02:53:22.000000000 +0000
@@ -1764,7 +1764,7 @@
char buf[BUFSZ];
if (!otmp) return 0;
- *buf = '\0'; /* lint suppresion */
+ *buf = '\0'; /* lint suppression */
/* special ring checks */
if (otmp == uright || otmp == uleft) {
diff -Ndur nethack-3.4.3/src/dog.c nethack-patched/src/dog.c
--- nethack-3.4.3/src/dog.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/dog.c 2006-03-29 02:56:22.000000000 +0000
@@ -408,7 +408,7 @@
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
diff -Ndur nethack-3.4.3/src/dogmove.c nethack-patched/src/dogmove.c
--- nethack-3.4.3/src/dogmove.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/dogmove.c 2006-03-30 01:25:12.000000000 +0000
@@ -271,7 +271,7 @@
omx = mtmp->mx;
omy = mtmp->my;
- /* if we are carrying sth then we drop it (perhaps near @) */
+ /* if we are carrying something then we drop it (perhaps near @) */
/* Note: if apport == 1 then our behaviour is independent of udist */
/* Use udist+1 so steed won't cause divide by zero */
#ifndef GOLDOBJ
diff -Ndur nethack-3.4.3/src/dokick.c nethack-patched/src/dokick.c
--- nethack-3.4.3/src/dokick.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/dokick.c 2006-03-30 01:28:24.000000000 +0000
@@ -140,7 +140,7 @@
for (i = 0; i < NATTK; i++) {
/* first of two kicks might have provoked counterattack
- that has incapacitated the hero (ie, floating eye) */
+ that has incapacitated the hero (e.g., floating eye) */
if (multi < 0) break;
uattk = &youmonst.data->mattk[i];
diff -Ndur nethack-3.4.3/src/dothrow.c nethack-patched/src/dothrow.c
--- nethack-3.4.3/src/dothrow.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/dothrow.c 2006-04-27 12:33:42.000000000 +0000
@@ -589,7 +589,7 @@
* throwing or kicking something.
*
* dx and dy should be the direction of the hurtle, not of the original
- * kick or throw and be only.
+ * kick or throw and be only. (Only what? -AJO)
*/
void
hurtle(dx, dy, range, verbose)
@@ -750,7 +750,7 @@
/* need to check for blindness result prior to destroying obj */
blindinc = (otyp == CREAM_PIE || otyp == BLINDING_VENOM) &&
- /* AT_WEAP is ok here even if attack type was AT_SPIT */
+ /* AT_WEAP is OK here even if attack type was AT_SPIT */
can_blnd(&youmonst, &youmonst, AT_WEAP, obj) ? rnd(25) : 0;
breakmsg(obj, !Blind);
@@ -875,7 +875,8 @@
/* only slip if it's greased or meant to be thrown */
if (obj->greased || throwing_weapon(obj))
/* BUG: this message is grammatically incorrect if obj has
- a plural name; greased gloves or boots for instance. */
+ a plural name; greased gloves or boots for instance.
+ (Apparently fixed. --AJO, 3.4.3) */
pline("%s as you throw it!", Tobjnam(obj, "slip"));
else slipok = FALSE;
}
@@ -1154,7 +1155,7 @@
const char *missile = mshot_xname(obj);
/* If the target can't be seen or doesn't look like a valid target,
- avoid "the arrow misses it," or worse, "the arrows misses the mimic."
+ avoid "the arrow misses it," or worse, "the arrow misses the mimic."
An attentive player will still notice that this is different from
an arrow just landing short of any target (no message in that case),
so will realize that there is a valid target here anyway. */
@@ -1283,7 +1284,7 @@
tmp += weapon_hit_bonus(uwep);
if (uwep->oartifact) tmp += spec_abon(uwep, mon);
/*
- * Elves and Samurais are highly trained w/bows,
+ * Elves and Samurai are highly trained w/bows,
* especially their own special types of bow.
* Polymorphing won't make you a bow expert.
*/
@@ -1491,8 +1492,8 @@
* object is going to break.
* breakmsg() - which outputs a message about the breakage,
* appropriate for that particular object. Should
- * only be called after a positve breaktest().
- * on the object and, if it going to be called,
+ * only be called after a positive breaktest()
+ * on the object and, if it is going to be called,
* it must be called before calling breakobj().
* Calling breakmsg() is optional.
* breakobj() - which actually does the breakage and the side-effects
@@ -1505,7 +1506,7 @@
* perform the routines above in the correct sequence.
*
* hero_breaks() - called when an object is to be broken as a result
- * of something that the hero has done. (throwing it,
+ * of something that the hero has done (throwing it,
* kicking it, etc.)
* breaks() - called when an object is to be broken for some
* reason other than the hero doing something to it.
diff -Ndur nethack-3.4.3/src/drawing.c nethack-patched/src/drawing.c
--- nethack-3.4.3/src/drawing.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/drawing.c 2006-03-30 01:43:42.000000000 +0000
@@ -5,7 +5,7 @@
#include "hack.h"
#include "tcap.h"
-/* Relevent header information in rm.h and objclass.h. */
+/* Relevant header information in rm.h and objclass.h. */
#ifdef C
#undef C
diff -Ndur nethack-3.4.3/src/dungeon.c nethack-patched/src/dungeon.c
--- nethack-3.4.3/src/dungeon.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/dungeon.c 2006-04-25 22:57:58.000000000 +0000
@@ -514,7 +514,7 @@
/* init level possibilities */
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,
@@ -560,9 +560,9 @@
/*
* Place a level. First, find the possible places on a dungeon map
* template. Next pick one. Then try to place the next level. If
- * sucessful, we're done. Otherwise, try another (and another) until
+ * successful, 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)
@@ -1211,7 +1211,7 @@
* either supplied by the user (teleport control) or randomly generated.
* But more than one level can be at the same depth. If the target level
* is "above" the present depth location, get_level must trace "up" from
- * the player's location (through the ancestors dungeons) the dungeon
+ * the player's location (through the ancestor dungeons) the dungeon
* within which the target level is located. With only one exception
* which does not pass through this routine (see level_tele), teleporting
* "down" is confined to the current dungeon. At present, level teleport
@@ -1483,7 +1483,7 @@
nam = strcpy(buf, nam);
*(eos(buf) - 6) = '\0';
}
- /* hell is the old name, and wouldn't match; gehennom would match its
+ /* hell is the old name, and wouldn't match; Gehennom would match its
branch, yielding the castle level instead of the valley of the dead */
if (!strcmpi(nam, "gehennom") || !strcmpi(nam, "hell")) {
if (In_V_tower(&u.uz)) nam = " to Vlad's tower"; /* branch to... */
@@ -1494,7 +1494,7 @@
dlev = slev->dlevel;
idx = ledger_no(&dlev);
if ((dlev.dnum == u.uz.dnum ||
- /* within same branch, or else main dungeon <-> gehennom */
+ /* within same branch, or else main dungeon <-> Gehennom */
(u.uz.dnum == valley_level.dnum &&
dlev.dnum == medusa_level.dnum) ||
(u.uz.dnum == medusa_level.dnum &&
diff -Ndur nethack-3.4.3/src/eat.c nethack-patched/src/eat.c
--- nethack-3.4.3/src/eat.c 2005-11-18 23:36:46.000000000 +0000
+++ nethack-patched/src/eat.c 2006-03-30 02:13:00.000000000 +0000
@@ -178,7 +178,7 @@
STATIC_PTR
int
-eatmdone() /* called after mimicing is over */
+eatmdone() /* called after mimicking is over */
{
/* release `eatmbuf' */
if (eatmbuf) {
@@ -223,10 +223,11 @@
* 11/10/89: if hard, rarely vomit anyway, for slim chance.
*/
STATIC_OVL void
-choke(food) /* To a full belly all food is bad. (It.) */
- register struct obj *food;
+choke(food)
+register struct obj *food;
{
- /* only happens if you were satiated */
+ /* To a full belly all food is bad. */
+ /* (It only happens if you were satiated.) */
if (u.uhs != SATIATED) {
if (!food || food->otyp != AMULET_OF_STRANGULATION)
return;
@@ -955,7 +956,7 @@
* one with this one, and a count-1 in count
* chance of keeping the old one. (note
* that 1 in 1 and 0 in 1 are what we want
- * for the first one
+ * for the first one)
*/
if (!rn2(count)) {
#ifdef DEBUG
@@ -1313,7 +1314,7 @@
}
if (!mons[otmp->corpsenm].cnutrit) {
- /* no nutrution: rots away, no message if you passed out */
+ /* no nutrition: rots away, no message if you passed out */
if (!retcode) pline_The("corpse rots away completely.");
if (carried(otmp)) useup(otmp);
else useupf(otmp, 1L);
@@ -2520,11 +2521,11 @@
int amt;
{
/*
- * This is a hack to try to squelch several long standing mystery
+ * This is a hack to try to squelch several long-standing mystery
* food bugs. A better solution would be to rewrite the entire
* victual handling mechanism from scratch using a less complex
* model. Alternatively, this routine could call done_eating()
- * or food_disappears() but its callers would need revisions to
+ * or food_disappears(), but its callers would need revisions to
* cope with victual.piece unexpectedly going away.
*
* Multi-turn eating operates by setting the food's oeaten field
diff -Ndur nethack-3.4.3/src/engrave.c nethack-patched/src/engrave.c
--- nethack-3.4.3/src/engrave.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/engrave.c 2006-03-30 02:23:10.000000000 +0000
@@ -412,7 +412,7 @@
* 4 - Fluorite 9 - Corundum
* 5 - Apatite 10 - Diamond
*
- * Since granite is a igneous rock hardness ~ 7, anything >= 8 should
+ * Since granite is an igneous rock hardness ~ 7, anything >= 8 should
* probably be able to scratch the rock.
* Devaluation of less hard gems is not easily possible because obj struct
* does not contain individual oc_cost currently. 7/91
@@ -451,7 +451,7 @@
char post_engr_text[BUFSZ]; /* Text displayed after engraving prompt */
const char *everb; /* Present tense of engraving type */
const char *eloc; /* Where the engraving is (ie dust/floor/...) */
- char *sp; /* Place holder for space count of engr text */
+ char *sp; /* Placeholder for space count of engr text */
int len; /* # of nonspace chars of new engraving text */
int maxelen; /* Max allowable length of engraving text */
struct engr *oep = engr_at(u.ux,u.uy);
@@ -1072,7 +1072,7 @@
multi = -(maxelen/10);
} else
if (len > 1) otmp->spe -= len >> 1;
- else otmp->spe -= 1; /* Prevent infinite grafitti */
+ else otmp->spe -= 1; /* Prevent infinite graffiti */
}
if (multi) nomovemsg = "You finish defacing the dungeon.";
break;
diff -Ndur nethack-3.4.3/src/explode.c nethack-patched/src/explode.c
--- nethack-3.4.3/src/explode.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/explode.c 2006-03-30 02:26:32.000000000 +0000
@@ -558,7 +558,7 @@
* Splatter burning oil from x,y to the surrounding area.
*
* This routine should really take a how and direction parameters.
- * The how is how it was caused, e.g. kicked verses thrown. The
+ * The how is how it was caused, e.g. kicked versus thrown. The
* direction is which way to spread the flaming oil. Different
* "how"s would give different dispersal patterns. For example,
* kicking a burning flask will splatter differently from a thrown
diff -Ndur nethack-3.4.3/src/files.c nethack-patched/src/files.c
--- nethack-3.4.3/src/files.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/files.c 2006-03-30 18:00:26.000000000 +0000
@@ -399,7 +399,7 @@
/* Construct a file name for a level-type file, which is of the form
* something.level (with any old level stripped off).
* This assumes there is space on the end of 'file' to append
- * a two digit number. This is true for 'level'
+ * a two-digit number. This is true for 'level'
* but be careful if you use it for other things -dgk
*/
void
@@ -809,7 +809,7 @@
Strcat(SAVEF, ".sav");
# else
# if defined(WIN32)
- /* Obtain the name of the logged on user and incorporate
+ /* Obtain the name of the logged-on user and incorporate
* it into the name. */
Sprintf(fnamebuf, "%s-%s", get_username(0), plname);
(void)fname_encode("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.",
@@ -968,7 +968,7 @@
# if defined(UNIX) && defined(QT_GRAPHICS)
/* Name not stored in save file, so we have to extract it from
the filename, which loses information
- (eg. "/", "_", and "." characters are lost. */
+ (eg. "/", "_", and "." characters are lost). */
int k;
int uid;
char name[64]; /* more than PL_NSIZ */
diff -Ndur nethack-3.4.3/src/fountain.c nethack-patched/src/fountain.c
--- nethack-3.4.3/src/fountain.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/fountain.c 2006-03-30 18:28:08.000000000 +0000
@@ -454,7 +454,7 @@
long money = money_cnt(invent);
struct obj *otmp;
if (money > 10) {
- /* Amount to loose. Might get rounded up as fountains don't pay change... */
+ /* Amount to lose. Might get rounded up as fountains don't pay change... */
money = somegold(money) / 10;
for (otmp = invent; otmp && money > 0; otmp = otmp->nobj) if (otmp->oclass == COIN_CLASS) {
int denomination = objects[otmp->otyp].oc_cost;
diff -Ndur nethack-3.4.3/src/hack.c nethack-patched/src/hack.c
--- nethack-3.4.3/src/hack.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/hack.c 2006-03-30 21:23:32.000000000 +0000
@@ -2283,8 +2283,8 @@
#ifdef GOLDOBJ
/* Counts the money in an object chain. */
-/* Intended use is for your or some monsters inventory, */
-/* now that u.gold/m.gold is gone.*/
+/* Intended use is for your or some monster's inventory, */
+/* now that u.gold/m.gold is gone. */
/* Counting money in a container might be possible too. */
long
money_cnt(otmp)
diff -Ndur nethack-3.4.3/src/invent.c nethack-patched/src/invent.c
--- nethack-3.4.3/src/invent.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/invent.c 2006-03-30 22:29:20.000000000 +0000
@@ -764,7 +764,7 @@
#ifndef GOLDOBJ
boolean allowgold = FALSE; /* can't use gold because they don't have any */
#endif
- boolean usegold = FALSE; /* can't use gold because its illegal */
+ boolean usegold = FALSE; /* can't use gold because it's illegal */
boolean allowall = FALSE;
boolean allownone = FALSE;
boolean useboulder = FALSE;
@@ -1704,7 +1704,7 @@
anything any;
menu_item *selected;
- /* overriden by global flag */
+ /* overridden by global flag */
if (flags.perm_invent) {
win = (lets && *lets) ? local_win : WIN_INVEN;
/* create the first time used */
@@ -1720,9 +1720,9 @@
item(s) dropped. One down side: the addition of the exception
for permanent inventory window updates _can_ pop the window
up when it's not displayed -- even if it's empty -- because we
- don't know at this level if its up or not. This may not be
+ don't know at this level if it's up or not. This may not be
an issue if empty checks are done before hand and the call
- to here is short circuited away.
+ to here is short-circuited away.
*/
if (!invent && !(flags.perm_invent && !lets && !want_reply)) {
#ifndef GOLDOBJ
@@ -2151,7 +2151,7 @@
don't show them unless obj_cnt is 0 */
int
look_here(obj_cnt, picked_some)
-int obj_cnt; /* obj_cnt > 0 implies that autopickup is in progess */
+int obj_cnt; /* obj_cnt > 0 implies that autopickup is in progress */
boolean picked_some;
{
struct obj *otmp;
@@ -2265,7 +2265,7 @@
return(!!Blind);
}
-/* explicilty look at what is here, including all objects */
+/* explicitly look at what is here, including all objects */
int
dolook()
{
@@ -2318,7 +2318,7 @@
}
STATIC_OVL boolean
-mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */
+mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */
register struct obj *otmp, *obj;
{
if (obj->otyp != otmp->otyp) return FALSE;
diff -Ndur nethack-3.4.3/src/light.c nethack-patched/src/light.c
--- nethack-3.4.3/src/light.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/light.c 2006-03-30 22:34:34.000000000 +0000
@@ -34,7 +34,7 @@
*
* The structure of the save/restore mechanism is amazingly similar to
* the timer save/restore. This is because they both have the same
- * principals of having pointers into objects that must be recalculated
+ * principles of having pointers into objects that must be recalculated
* across saves and restores.
*/
@@ -179,7 +179,7 @@
if (ls->x == u.ux && ls->y == u.uy) {
/*
* If the light source is located at the hero, then
- * we can use the COULD_SEE bits already calcualted
+ * we can use the COULD_SEE bits already calculated
* by the vision system. More importantly than
* this optimization, is that it allows the vision
* system to correct problems with clear_path().
@@ -488,7 +488,7 @@
(obj->otyp == MAGIC_LAMP || ignitable(obj) || artifact_light(obj)));
}
-/* copy the light source(s) attachted to src, and attach it/them to dest */
+/* copy the light source(s) attached to src, and attach it/them to dest */
void
obj_split_light_source(src, dest)
struct obj *src, *dest;
diff -Ndur nethack-3.4.3/src/mail.c nethack-patched/src/mail.c
--- nethack-3.4.3/src/mail.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/mail.c 2006-03-30 22:40:58.000000000 +0000
@@ -140,7 +140,7 @@
*/
if (Blind && !Blind_telepat) {
if (!enexto(startp, u.ux, u.uy, (struct permonst *) 0))
- return FALSE; /* no good posiitons */
+ return FALSE; /* no good positions */
return TRUE;
}
diff -Ndur nethack-3.4.3/src/makemon.c nethack-patched/src/makemon.c
--- nethack-3.4.3/src/makemon.c 2005-11-18 23:36:48.000000000 +0000
+++ nethack-patched/src/makemon.c 2006-03-31 01:33:36.000000000 +0000
@@ -414,13 +414,13 @@
(void)mongets(mtmp, FLAIL);
break;
}
- /* prevent djinnis and mail daemons from leaving objects when
+ /* prevent djinn and mail daemons from leaving objects when
* they vanish
*/
if (!is_demon(ptr)) break;
/* fall thru */
/*
- * Now the general case, Some chance of getting some type
+ * Now the general case. Some chance of getting some type
* of weapon for "normal" monsters. Certain special types
* of monsters will get a bonus chance or different selections.
*/
diff -Ndur nethack-3.4.3/src/mhitm.c nethack-patched/src/mhitm.c
--- nethack-3.4.3/src/mhitm.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mhitm.c 2006-03-31 01:47:44.000000000 +0000
@@ -36,7 +36,7 @@
static int dieroll;
/* returns mon_nam(mon) relative to other_mon; normal name unless they're
- the same, in which case the reference is to {him|her|it} self */
+ the same, in which case the reference is to {him|her|it}self */
STATIC_OVL char *
mon_nam_too(outbuf, mon, other_mon)
char *outbuf;
@@ -187,7 +187,7 @@
* 0x0 MM_MISS
*
* Each successive attack has a lower probability of hitting. Some rely on the
- * 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.
*/
@@ -196,7 +196,7 @@
register struct monst *magr,*mdef;
{
int i, /* loop counter */
- tmp, /* amour class difference */
+ tmp, /* armour class difference */
strike, /* hit this attack */
attk, /* attack attempted this time */
struck = 0, /* hit at least once */
@@ -220,7 +220,7 @@
mdef->msleeping = 0;
}
- /* undetect monsters become un-hidden if they are attacked */
+ /* undetected monsters become un-hidden if they are attacked */
if (mdef->mundetected) {
mdef->mundetected = 0;
newsym(mdef->mx, mdef->my);
@@ -364,7 +364,7 @@
/*
* Wake up the defender. NOTE: this must follow the check
* to see if the defender died. We don't want to modify
- * unallocated monsters!
+ * deallocated monsters!
*/
if (strike) mdef->msleeping = 0;
@@ -504,7 +504,7 @@
(void) snuff_lit(obj);
/*
- * All of this maniuplation is needed to keep the display correct.
+ * All of this manipulation is needed to keep the display correct.
* There is a flush at the next pline().
*/
ax = magr->mx;
@@ -512,8 +512,8 @@
dx = mdef->mx;
dy = mdef->my;
/*
- * Leave the defender in the monster chain at it's current position,
- * but don't leave it on the screen. Move the agressor to the def-
+ * Leave the defender in the monster chain at its current position,
+ * but don't leave it on the screen. Move the aggressor to the def-
* ender's position.
*/
remove_monster(ax, ay);
@@ -535,7 +535,7 @@
place_monster(magr, dx, dy);
newsym(dx, dy);
}
- else if (status & MM_AGR_DIED) { /* agressor died */
+ else if (status & MM_AGR_DIED) { /* aggressor died */
place_monster(mdef, dx, dy);
newsym(dx, dy);
}
@@ -568,7 +568,7 @@
result = mdamagem(magr, mdef, mattk);
- /* Kill off agressor if it didn't die. */
+ /* Kill off aggressor if it didn't die. */
if (!(result & MM_AGR_DIED)) {
mondead(magr);
if (magr->mhp > 0) return result; /* life saved */
diff -Ndur nethack-3.4.3/src/minion.c nethack-patched/src/minion.c
--- nethack-3.4.3/src/minion.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/minion.c 2006-03-31 01:57:56.000000000 +0000
@@ -178,7 +178,7 @@
return 0;
} else {
/* make sure that the demand is unmeetable if the monster
- has the Amulet, preventing monster from being satisified
+ has the Amulet, preventing monster from being satisfied
and removed from the game (along with said Amulet...) */
if (mon_has_amulet(mtmp))
demand = cash + (long)rn1(1000,40);
diff -Ndur nethack-3.4.3/src/mklev.c nethack-patched/src/mklev.c
--- nethack-3.4.3/src/mklev.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mklev.c 2006-03-31 02:00:10.000000000 +0000
@@ -229,7 +229,7 @@
boolean tried_vault = FALSE;
/* make rooms until satisfied */
- /* rnd_rect() will returns 0 if no more rects are available... */
+ /* rnd_rect() will return 0 if no more rects are available... */
while(nroom < MAXNROFROOMS && rnd_rect()) {
if(nroom >= (MAXNROFROOMS/6) && rn2(2) && !tried_vault) {
tried_vault = TRUE;
@@ -611,7 +611,7 @@
int room_threshold;
if(wiz1_level.dlevel == 0) init_dungeons();
- oinit(); /* assign level dependent obj probabilities */
+ oinit(); /* assign level-dependent obj probabilities */
clear_level_structures();
{
diff -Ndur nethack-3.4.3/src/mkmaze.c nethack-patched/src/mkmaze.c
--- nethack-3.4.3/src/mkmaze.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mkmaze.c 2006-03-31 02:08:42.000000000 +0000
@@ -414,7 +414,7 @@
struct obj *otmp;
int tryct;
- croom = &rooms[0]; /* only one room on the medusa level */
+ croom = &rooms[0]; /* only one room on the Medusa level */
for (tryct = rnd(4); tryct; tryct--) {
x = somex(croom); y = somey(croom);
if (goodpos(x, y, (struct monst *)0, 0)) {
diff -Ndur nethack-3.4.3/src/mkobj.c nethack-patched/src/mkobj.c
--- nethack-3.4.3/src/mkobj.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mkobj.c 2006-03-31 02:18:02.000000000 +0000
@@ -1281,7 +1281,7 @@
}
/*
- * Free obj from whatever list it is on in preperation of deleting it or
+ * Free obj from whatever list it is on in preparation for deleting it or
* moving it elsewhere. This will perform all high-level consequences
* involved with removing the item. E.g. if the object is in the hero's
* inventory and confers heat resistance, the hero will lose it.
@@ -1491,7 +1491,7 @@
*
* We may want to just call del_light_source() without any
* checks (requires a code change there). Otherwise this
- * list must track all objects that can have a light source
+ * list must track each object that can have a light source
* attached to it (and also requires lamplit to be set).
*/
if (obj_sheds_light(obj))
diff -Ndur nethack-3.4.3/src/mon.c nethack-patched/src/mon.c
--- nethack-3.4.3/src/mon.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mon.c 2006-03-31 17:47:22.000000000 +0000
@@ -153,7 +153,7 @@
#define KEEPTRAITS(mon) ((mon)->isshk || (mon)->mtame || \
((mon)->data->geno & G_UNIQ) || \
is_reviver((mon)->data) || \
- /* normally leader the will be unique, */ \
+ /* normally the leader will be unique, */ \
/* but he might have been polymorphed */ \
(mon)->m_id == quest_status.leader_m_id || \
/* special cancellation handling for these */ \
@@ -308,7 +308,7 @@
* underneath it, you could be told the corpse type of a
* monster that you never knew was there without this.
* The code in hitmu() substitutes the word "something"
- * if the corpses obj->dknown is 0.
+ * if the corpse's obj->dknown is 0.
*/
if (Blind && !sensemon(mtmp)) obj->dknown = 0;
@@ -609,7 +609,7 @@
if (Conflict && !mtmp->iswiz && mtmp->mcansee) {
/* Note:
* Conflict does not take effect in the first round.
- * Therefore, A monster when stepping into the area will
+ * Therefore, a monster when stepping into the area will
* get to swing at you.
*
* The call to fightm() must be _last_. The monster might
@@ -2142,7 +2142,7 @@
register struct monst *mtmp;
{
mtmp->msleeping = 0;
- mtmp->meating = 0; /* assume there's no salvagable food left */
+ mtmp->meating = 0; /* assume there's no salvageable food left */
setmangry(mtmp);
if(mtmp->m_ap_type) seemimic(mtmp);
else if (flags.forcefight && !flags.mon_moving && mtmp->mundetected) {
@@ -2405,7 +2405,7 @@
mdat = &mons[mndx];
if ((mvitals[mndx].mvflags & G_GENOD) != 0 ||
is_placeholder(mdat)) continue;
- /* polyok rules out all M2_PNAME and M2_WERE's;
+ /* polyok rules out all M2_PNAME and M2_WEREs;
select_newcham_form might deliberately pick a player
character type, so we can't arbitrarily rule out all
human forms any more */
@@ -2582,14 +2582,14 @@
int mnum;
{
/* ranger quest nemesis has the oviparous bit set, making it
- be possible to wish for eggs of that unique monster; turn
+ possible to wish for eggs of that unique monster; turn
such into ordinary eggs rather than forbidding them outright */
if (mnum == PM_SCORPIUS) mnum = PM_SCORPION;
mnum = little_to_big(mnum);
/*
* Queen bees lay killer bee eggs (usually), but killer bees don't
- * grow into queen bees. Ditto for [winged-]gargoyles.
+ * grow into queen bees. Ditto for [winged] gargoyles.
*/
if (mnum == PM_KILLER_BEE || mnum == PM_GARGOYLE ||
(lays_eggs(&mons[mnum]) && (BREEDER_EGG ||
diff -Ndur nethack-3.4.3/src/mondata.c nethack-patched/src/mondata.c
--- nethack-3.4.3/src/mondata.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/mondata.c 2006-03-31 19:07:10.000000000 +0000
@@ -161,7 +161,7 @@
if (is_you && Blindfolded)
return FALSE;
} else if (obj && (obj->otyp == BLINDING_VENOM)) {
- /* all ublindf, including LENSES, protect, cream-pies too */
+ /* all ublindf, including LENSES, protect, cream pies too */
if (is_you && (ublindf || u.ucreamed))
return FALSE;
check_visor = TRUE;
@@ -247,7 +247,7 @@
(ptr->mlet==S_IMP && ptr != &mons[PM_TENGU])));
}
-/* true iff the type of monster pass through iron bars */
+/* true iff the type of monster can pass through iron bars */
boolean
passes_bars(mptr)
struct permonst *mptr;
diff -Ndur nethack-3.4.3/src/monmove.c nethack-patched/src/monmove.c
--- nethack-3.4.3/src/monmove.c 2005-11-18 23:36:50.000000000 +0000
+++ nethack-patched/src/monmove.c 2006-04-02 01:31:50.000000000 +0000
@@ -180,7 +180,7 @@
* not stealthy or (mon is an ettin and 9/10) AND
* (mon is not a nymph, jabberwock, or leprechaun) or 1/50 AND
* Aggravate or mon is (dog or human) or
- * (1/7 and mon is not mimicing furniture or object)
+ * (1/7 and mon is not mimicking furniture or object)
*/
if(couldsee(mtmp->mx,mtmp->my) &&
distu(mtmp->mx,mtmp->my) <= 100 &&
@@ -351,7 +351,7 @@
m_respond(mtmp);
if (mdat == &mons[PM_MEDUSA] && couldsee(mtmp->mx, mtmp->my))
m_respond(mtmp);
- if (mtmp->mhp <= 0) return(1); /* m_respond gaze can kill medusa */
+ if (mtmp->mhp <= 0) return(1); /* m_respond gaze can kill Medusa */
/* fleeing monsters might regain courage */
if (mtmp->mflee && !mtmp->mfleetim
@@ -667,7 +667,7 @@
ty = STRAT_GOALY(mtmp->mstrategy);
struct monst *intruder = m_at(tx, ty);
/*
- * if there's a monster on the object or in possesion of it,
+ * if there's a monster on the object or in possession of it,
* attack it.
*/
if((dist2(mtmp->mx, mtmp->my, tx, ty) < 2) &&
diff -Ndur nethack-3.4.3/src/monst.c nethack-patched/src/monst.c
--- nethack-3.4.3/src/monst.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/monst.c 2006-04-02 01:45:32.000000000 +0000
@@ -74,8 +74,8 @@
* * Use colors given in names wherever possible. If the class has `real'
* members with strong color associations, use those.
*
- * * Favor `cool' colors for cold-resistent monsters, `warm' ones for
- * fire-resistent ones.
+ * * Favor `cool' colors for cold-resistant monsters, `warm' ones for
+ * fire-resistant ones.
*
* * Try to reserve purple (magenta) for powerful `ruler' monsters (queen
* bee, kobold lord, &c.).
@@ -3292,7 +3292,7 @@
M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_HOSTILE|M2_STALK|M2_NASTY|
M2_COLLECT|M2_MAGIC,
M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISIBLE, HI_LORD),
- /* A renegade daimyo who led a 13 year civil war against the shogun
+ /* A renegade daimyo who led a 13-year civil war against the shogun
* of his time.
*/
MON("Ashikaga Takauji", S_HUMAN,
diff -Ndur nethack-3.4.3/src/mthrowu.c nethack-patched/src/mthrowu.c
--- nethack-3.4.3/src/mthrowu.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/mthrowu.c 2006-04-02 01:51:32.000000000 +0000
@@ -52,7 +52,7 @@
kprefix = KILLED_BY; /* killer_name supplies "an" if warranted */
} else {
knm = name;
- /* [perhaps ought to check for plural here to] */
+ /* [perhaps ought to check for plural here too] */
if (!strncmpi(name, "the ", 4) ||
!strncmpi(name, "an ", 3) ||
!strncmpi(name, "a ", 2)) kprefix = KILLED_BY;
@@ -143,7 +143,7 @@
struct obj *otmp; /* missile; might be destroyed by drop_throw */
int range; /* how much farther will object travel if it misses */
/* Use -1 to signify to keep going even after hit, */
- /* unless its gone (used for rolling_boulder_traps) */
+ /* unless it's gone (used for rolling_boulder_traps) */
boolean verbose; /* give message(s) even when you can't see what happened */
{
int damage, tmp;
@@ -686,7 +686,7 @@
mtmp->mx, mtmp->my, sgn(tbx), sgn(tby));
nomul(0);
/* breath runs out sometimes. Also, give monster some
- * cunning; don't breath if the player fell asleep.
+ * cunning; don't breathe if the player fell asleep.
*/
if(!rn2(3))
mtmp->mspec_used = 10+rn2(20);
diff -Ndur nethack-3.4.3/src/muse.c nethack-patched/src/muse.c
--- nethack-3.4.3/src/muse.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/muse.c 2006-04-24 19:10:36.000000000 +0000
@@ -421,7 +421,7 @@
t = t_at(x,y);
if (t && (t->ttyp == PIT || t->ttyp == SPIKED_PIT ||
t->ttyp == WEB || t->ttyp == BEAR_TRAP))
- t = 0; /* ok for monster to dig here */
+ t = 0; /* OK for monster to dig here */
#define nomore(x) if(m.has_defense==x) continue;
for (obj = mtmp->minvent; obj; obj = obj->nobj) {
@@ -1581,8 +1581,8 @@
if (u.uswallow && stuck) return FALSE;
/* We arbitrarily limit to times when a player is nearby for the
- * same reason as Junior Pac-Man doesn't have energizers eaten until
- * you can see them...
+ * same reason that Junior Pac-Man doesn't have energizers eaten
+ * until you can see them...
*/
if(dist2(x, y, mtmp->mux, mtmp->muy) > 36)
return FALSE;
diff -Ndur nethack-3.4.3/src/music.c nethack-patched/src/music.c
--- nethack-3.4.3/src/music.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/music.c 2006-04-02 14:54:16.000000000 +0000
@@ -293,7 +293,7 @@
}
/* We have to check whether monsters or player
- falls in a chasm... */
+ fall into a chasm... */
if (mtmp) {
if(!is_flyer(mtmp->data) && !is_clinger(mtmp->data)) {
@@ -437,7 +437,7 @@
exercise(A_DEX, TRUE);
break;
} /* else FALLTHRU */
- case WOODEN_HARP: /* May calm Nymph */
+ case WOODEN_HARP: /* May calm nymph */
do_spec &= (rn2(ACURR(A_DEX)) + u.ulevel > 25);
pline("%s %s.", The(xname(instr)),
do_spec ? "produces a lilting melody" : "twangs");
diff -Ndur nethack-3.4.3/src/objects.c nethack-patched/src/objects.c
--- nethack-3.4.3/src/objects.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/objects.c 2006-04-02 15:00:46.000000000 +0000
@@ -324,7 +324,7 @@
* There is code in obj.h, objnam.c, mon.c, read.c that assumes (2).
*
* (1) The dragon scale mails and the dragon scales are together.
- * (2) That the order of the dragon scale mail and dragon scales is the
+ * (2) That the order of the dragon scale mail and dragon scales is
* the same defined in monst.c.
*/
#define DRGN_ARMR(name,mgc,power,cost,ac,color) \
@@ -587,7 +587,7 @@
CONTAINER("bag of tricks", "bag", 0, 1, 1, 20, 15, 100, CLOTH, HI_CLOTH),
#undef CONTAINER
-/* lock opening tools */
+/* lock-opening tools */
TOOL("skeleton key", "key", 0, 0, 0, 0, 80, 3, 10, IRON, HI_METAL),
#ifdef TOURIST
TOOL("lock pick", (char *)0, 1, 0, 0, 0, 60, 4, 20, IRON, HI_METAL),
@@ -671,7 +671,7 @@
FOOD_CLASS, prob, delay, \
wt, nutrition/20 + 5, 0, 0, 0, 0, nutrition, color )
/* all types of food (except tins & corpses) must have a delay of at least 1. */
-/* delay on corpses is computed and is weight dependant */
+/* delay on corpses is computed and is weight dependent */
/* dog eats foods 0-4 but prefers tripe rations above all others */
/* fortune cookies can be read */
/* carrots improve your vision */
diff -Ndur nethack-3.4.3/src/objnam.c nethack-patched/src/objnam.c
--- nethack-3.4.3/src/objnam.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/objnam.c 2006-04-02 23:25:16.000000000 +0000
@@ -209,7 +209,7 @@
return str;
}
-/* convert player specified fruit name into corresponding fruit juice name
+/* convert player-specified fruit name into corresponding fruit juice name
("slice of pizza" -> "pizza juice" rather than "slice of pizza juice") */
char *
fruitname(juice)
@@ -605,7 +605,7 @@
obj->oclass == RING_CLASS))
/* For most items with charges or +/-, if you know how many
* charges are left or what the +/- is, then you must have
- * totally identified the item, so "uncursed" is unneccesary,
+ * totally identified the item, so "uncursed" is unnecessary,
* because an identified object not described as "blessed" or
* "cursed" must be uncursed.
*
@@ -1262,7 +1262,7 @@
* Also used for plural monster names ("Wiped out all homunculi.")
* and body parts.
*
- * Also misused by muse.c to convert 1st person present verbs to 2nd person.
+ * Also misused by muse.c to convert 1st person present verbs to 3rd person.
*/
char *
makeplural(oldstr)
diff -Ndur nethack-3.4.3/src/options.c nethack-patched/src/options.c
--- nethack-3.4.3/src/options.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/options.c 2006-04-04 01:41:14.000000000 +0000
@@ -559,7 +559,7 @@
#endif /* UNIX && TTY_GRAPHICS */
#if defined(UNIX) || defined(VMS)
# ifdef TTY_GRAPHICS
- /* detect whether a "vt" terminal can handle alternate charsets */
+ /* detect whether a "vt" terminal can handle alternative charsets */
if ((opts = nh_getenv("TERM")) &&
!strncmpi(opts, "vt", 2) && AS && AE &&
index(AS, '\016') && index(AE, '\017')) {
@@ -598,9 +598,10 @@
(void)fruitadd(pl_fruit);
/* Remove "slime mold" from list of object names; this will */
- /* prevent it from being wished unless it's actually present */
- /* as a named (or default) fruit. Wishing for "fruit" will */
- /* result in the player's preferred fruit [better than "\033"]. */
+ /* prevent it from being wished for unless it's actually */
+ /* present as a named (or default) fruit. Wishing for "fruit" */
+ /* will result in the player's preferred fruit */
+ /* [better than "\033"]. */
obj_descr[SLIME_MOLD].oc_name = "fruit";
return;
@@ -626,7 +627,7 @@
* \n, \b, \t, \r, \xnnn (hex), \onnn (octal), \nnn (decimal). The ^-prefix
* for control characters is also understood, and \[mM] followed by any of the
* previous forms or by a character has the effect of 'meta'-ing the value (so
- * that the alternate character set will be enabled).
+ * that the alternative character set will be enabled).
*/
STATIC_OVL void
escapes(cp, tp)
@@ -1692,7 +1693,7 @@
num = 0;
while (*op) {
oc_sym = def_char_to_objclass(*op);
- /* make sure all are valid obj symbols occuring once */
+ /* make sure all are valid obj symbols occurring once */
if (oc_sym != MAXOCLASSES &&
!index(flags.pickup_types, oc_sym)) {
flags.pickup_types[num] = (char)oc_sym;
@@ -1724,7 +1725,7 @@
/* 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
* There is an array in flags:
* end_disclose[NUM_DISCLOSURE_OPT];
@@ -1740,7 +1741,7 @@
* string as a prefix to get the desired behaviour.
*
* For backward compatibility, no prefix is required,
- * and the presence of a i,a,g,v, or c without a prefix
+ * and the presence of an i,a,g,v, or c without a prefix
* sets the corresponding value to DISCLOSE_YES_WITHOUT_PROMPT.
*/
boolean badopt = FALSE;
@@ -3468,10 +3469,10 @@
* FALSE = PICK_ONE, TRUE = PICK_ANY
*
* class_list
- * a null terminated string containing the list of choices.
+ * a null-terminated string containing the list of choices.
*
* class_selection
- * a null terminated string containing the selected characters.
+ * a null-terminated string containing the selected characters.
*
* Returns number selected.
*/
diff -Ndur nethack-3.4.3/src/pager.c nethack-patched/src/pager.c
--- nethack-3.4.3/src/pager.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/pager.c 2006-04-24 19:25:18.000000000 +0000
@@ -3,7 +3,7 @@
/* NetHack may be freely redistributed. See license for details. */
/* This file contains the command routines dowhatis() and dohelp() and */
-/* a few other help related facilities */
+/* a few other help-related facilities */
#include "hack.h"
#include "dlb.h"
@@ -178,7 +178,7 @@
/* telepathy */
if (tp_sensemon(mtmp))
ways_seen++;
- /* xray */
+ /* x-ray */
if (useemon && xraydist > 0 &&
distu(mtmp->mx, mtmp->my) <= xraydist)
ways_seen++;
diff -Ndur nethack-3.4.3/src/pickup.c nethack-patched/src/pickup.c
--- nethack-3.4.3/src/pickup.c 2005-11-18 23:36:52.000000000 +0000
+++ nethack-patched/src/pickup.c 2006-04-06 02:36:12.000000000 +0000
@@ -771,13 +771,13 @@
if (mi->count == -1L || mi->count > mi->item.a_obj->quan)
mi->count = mi->item.a_obj->quan;
} else if (n < 0) {
- n = 0; /* caller's don't expect -1 */
+ n = 0; /* callers don't expect -1 */
}
return n;
}
/*
- * allow menu-based category (class) selection (for Drop,take off etc.)
+ * allow menu-based category (class) selection (for Drop, take off, etc.)
*
*/
int
@@ -939,7 +939,7 @@
n = select_menu(win, how, pick_list);
destroy_nhwindow(win);
if (n < 0)
- n = 0; /* caller's don't expect -1 */
+ n = 0; /* callers don't expect -1 */
return n;
}
@@ -1206,7 +1206,7 @@
/* To prevent qbuf overflow in prompts use planA only
* if it fits, or planB if PlanA doesn't fit,
* finally using the fallback as a last resort.
- * last_restort is expected to be very short.
+ * last_resort is expected to be very short.
*/
const char *
safe_qbuf(qbuf, padlength, planA, planB, last_resort)
@@ -1345,7 +1345,7 @@
return res;
#ifdef GOLDOBJ
- /* Whats left of the special case for gold :-) */
+ /* What's left of the special case for gold :-) */
if (obj->oclass == COIN_CLASS) flags.botl = 1;
#endif
if (obj->quan != count && obj->otyp != LOADSTONE)
@@ -1591,7 +1591,7 @@
for (pass = 2; pass > -1; pass -= 2)
for (coffers = fobj; coffers; coffers = coffers->nobj)
if (coffers->otyp == CHEST && coffers->spe == pass)
- goto gotit; /* two level break */
+ goto gotit; /* two-level break */
gotit:
if (coffers) {
verbalize("Thank you for your contribution to reduce the debt.");
@@ -1760,7 +1760,7 @@
}
/* A variable set in use_container(), to be used by the callback routines */
-/* in_container(), and out_container() from askchain() and use_container(). */
+/* in_container() and out_container(), from askchain() and use_container(). */
static NEARDATA struct obj *current_container;
#define Icebox (current_container->otyp == ICE_BOX)
diff -Ndur nethack-3.4.3/src/polyself.c nethack-patched/src/polyself.c
--- nethack-3.4.3/src/polyself.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/polyself.c 2006-04-06 04:01:40.000000000 +0000
@@ -682,7 +682,7 @@
if ((otmp = uwep) != 0) {
/* !alone check below is currently superfluous but in the
- * future it might not be so if there are monsters which cannot
+ * future it might not be so, if there are monsters which cannot
* wear gloves but can wield weapons
*/
if (!alone || cantwield(youmonst.data)) {
@@ -983,7 +983,7 @@
continue;
}
/* No reflection check for consistency with when a monster
- * gazes at *you*--only medusa gaze gets reflected then.
+ * gazes at *you*--only Medusa's gaze gets reflected then.
*/
if (adtyp == AD_CONF) {
if (!mtmp->mconf)
diff -Ndur nethack-3.4.3/src/potion.c nethack-patched/src/potion.c
--- nethack-3.4.3/src/potion.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/potion.c 2006-04-06 22:21:08.000000000 +0000
@@ -727,7 +727,7 @@
case POT_SPEED:
if(Wounded_legs && !otmp->cursed
#ifdef STEED
- && !u.usteed /* heal_legs() would heal steeds legs */
+ && !u.usteed /* heal_legs() would heal steed's legs */
#endif
) {
heal_legs();
@@ -1889,7 +1889,7 @@
if (mixture == POT_WATER)
singlepotion->cursed = singlepotion->odiluted = 0;
else
- singlepotion->cursed = obj->cursed; /* odiluted left as-is */
+ singlepotion->cursed = obj->cursed; /* odiluted left as is */
singlepotion->bknown = FALSE;
if (Blind) {
singlepotion->dknown = FALSE;
diff -Ndur nethack-3.4.3/src/pray.c nethack-patched/src/pray.c
--- nethack-3.4.3/src/pray.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/pray.c 2006-04-06 22:55:28.000000000 +0000
@@ -107,8 +107,8 @@
returns the worst problem. There may be others, and the gods may fix
more than one.
-This could get as bizarre as noting surrounding opponents, (or hostile dogs),
-but that's really hard.
+ This could get as bizarre as noting surrounding opponents (or hostile
+ dogs), but that's really hard.
*/
#define ugod_is_angry() (u.ualign.record < 0)
@@ -219,7 +219,7 @@
/* gloves come next, due to rings */
} else if (uarmg && uarmg->cursed) { /* gloves */
otmp = uarmg;
- /* then shield due to two handed weapons and spells */
+ /* then shield due to two-handed weapons and spells */
} else if (uarms && uarms->cursed) { /* shield */
otmp = uarms;
/* then cloak due to body armor */
@@ -314,7 +314,7 @@
break;
case TROUBLE_HIT:
/* "fix all troubles" will keep trying if hero has
- 5 or less hit points, so make sure they're always
+ 5 or fewer hit points, so make sure they're always
boosted to be more than that */
You_feel("much better.");
if (Upolyd) {
@@ -811,7 +811,7 @@
- fix all of your problems.
- do you a gratuitous favor.
- if you make it to the the last category, you roll randomly again
+ If you make it to the last category, you roll randomly again
to see what they do for you.
If your luck is at least 0, then you are guaranteed rescued
@@ -1325,7 +1325,7 @@
(Is_astralevel(&u.uz) || Is_sanctum(&u.uz))) {
/*
* REAL BAD NEWS!!! High altars cannot be converted. Even an attempt
- * gets the god who owns it truely pissed off.
+ * gets the god who owns it truly pissed off.
*/
You_feel("the air around you grow charged...");
pline("Suddenly, you realize that %s has noticed you...", a_gname());
@@ -1359,7 +1359,7 @@
flags.botl = 1;
You("have a sudden sense of a new direction.");
- /* Beware, Conversion is costly */
+ /* Beware, conversion is costly */
change_luck(-3);
u.ublesscnt += 300;
adjalign((int)(u.ualignbase[A_ORIGINAL] * (ALIGNLIM / 2)));
@@ -1713,7 +1713,7 @@
} else if (!resist(mtmp, '\0', 0, TELL)) {
xlev = 6;
switch (mtmp->data->mlet) {
- /* this is intentional, lichs are tougher
+ /* this is intentional, liches are tougher
than zombies. */
case S_LICH: xlev += 2; /*FALLTHRU*/
case S_GHOST: xlev += 2; /*FALLTHRU*/
diff -Ndur nethack-3.4.3/src/quest.c nethack-patched/src/quest.c
--- nethack-3.4.3/src/quest.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/quest.c 2006-04-06 23:00:34.000000000 +0000
@@ -135,7 +135,7 @@
}
/*
- * 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 -Ndur nethack-3.4.3/src/questpgr.c nethack-patched/src/questpgr.c
--- nethack-3.4.3/src/questpgr.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/questpgr.c 2006-04-06 23:04:16.000000000 +0000
@@ -99,7 +99,7 @@
panic("CANNOT OPEN QUEST TEXT FILE %s.", QTEXT_FILE);
/*
- * Read in the number of classes, then the ID's & offsets for
+ * Read in the number of classes, then the IDs & offsets for
* each header.
*/
@@ -130,7 +130,7 @@
#ifdef DEBUG
dump_qtlist();
#endif
- return; /* no ***DON'T*** close the msg_file */
+ return; /* no, ***DON'T*** close the msg_file */
}
/* called at program exit */
diff -Ndur nethack-3.4.3/src/read.c nethack-patched/src/read.c
--- nethack-3.4.3/src/read.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/read.c 2006-04-06 23:10:16.000000000 +0000
@@ -610,7 +610,7 @@
/* 1 in 3 chance of forgetting some levels */
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));
if (howmuch & ALL_SPELLS) losespells();
@@ -619,7 +619,7 @@
* we need to go blind for an instant --- turn off the display,
* then restart it. All this work is needed to correctly handle
* walls which are stone on one side and wall on the other. Turning
- * off the seen bits above will make the wall revert to stone, but
+ * off the seen bits above will make the wall revert to stone, but
* there are cases where we don't want this to happen. The easiest
* thing to do is to run it through the vision system again, which
* is always correct.
@@ -1390,7 +1390,7 @@
#ifdef REINCARNATION
if (Is_rogue_level(&u.uz)) {
/* Can't use do_clear_area because MAX_RADIUS is too small */
- /* rogue lighting must light the entire room */
+ /* Rogue lighting must light the entire room */
int rnum = levl[u.ux][u.uy].roomno - ROOMOFFSET;
int rx, ry;
if(rnum >= 0) {
@@ -1400,7 +1400,7 @@
(genericptr_t)(on ? &is_lit : (char *)0));
rooms[rnum].rlit = on;
}
- /* hallways remain dark on the rogue level */
+ /* hallways remain dark on the Rogue level */
} else
#endif
do_clear_area(u.ux,u.uy,
diff -Ndur nethack-3.4.3/src/rect.c nethack-patched/src/rect.c
--- nethack-3.4.3/src/rect.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/rect.c 2006-04-06 23:16:00.000000000 +0000
@@ -22,7 +22,7 @@
/*
* Initialisation of internal structures. Should be called for every
- * new level to be build...
+ * new level to be built...
*/
void
@@ -35,7 +35,7 @@
}
/*
- * Search Index of one precise NhRect.
+ * Search for the index of a specific NhRect.
*
*/
@@ -57,7 +57,7 @@
}
/*
- * Search a free rectangle that include the one given in arg
+ * Search for a free rectangle that includes the one given in arg
*/
NhRect *
@@ -88,9 +88,9 @@
}
/*
- * Search intersection between two rectangles (r1 & r2).
- * return TRUE if intersection exist and put it in r3.
- * otherwise returns FALSE
+ * Search for the intersection of two rectangles (r1 & r2).
+ * Return TRUE if the intersection exists, and put it in r3.
+ * Otherwise returns FALSE
*/
static boolean
@@ -112,7 +112,7 @@
}
/*
- * Remove a rectangle from the list of free NhRect.
+ * Remove a rectangle from the list of free NhRects.
*/
void
@@ -127,7 +127,7 @@
}
/*
- * Add a NhRect to the list.
+ * Add an NhRect to the list.
*/
void
@@ -150,8 +150,8 @@
/*
* Okay, here we have two rectangles (r1 & r2).
* r1 was already in the list and r2 is included in r1.
- * What we want is to allocate r2, that is split r1 into smaller rectangles
- * then remove it.
+ * What we want is to allocate r2, that is, split r1 into smaller
+ * rectangles and then remove it.
*/
void
diff -Ndur nethack-3.4.3/src/region.c nethack-patched/src/region.c
--- nethack-3.4.3/src/region.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/region.c 2006-04-06 23:20:04.000000000 +0000
@@ -229,7 +229,7 @@
/* not yet used */
/*
- * Clone (make a standalone copy) the region.
+ * Clone (make a standalone copy of) the region.
*/
NhRegion *
clone_region(reg)
@@ -366,7 +366,7 @@
/*
* This function is called every turn.
- * It makes the regions age, if necessary and calls the appropriate
+ * It makes the regions age, if necessary, and calls the appropriate
* callbacks when needed.
*/
void
@@ -375,7 +375,7 @@
register int i, j, k;
int f_indx;
- /* End of life ? */
+ /* End of life? */
/* Do it backward because the array will be modified */
for (i = n_regions - 1; i >= 0; i--) {
if (regions[i]->ttl == 0) {
@@ -464,7 +464,7 @@
}
/*
- * check wether a monster enters/leaves one or more region.
+ * check whether a monster enters/leaves one or more regions.
*/
boolean
m_in_out_region(mon, x, y)
@@ -512,7 +512,7 @@
}
/*
- * Checks player's regions after a teleport for instance.
+ * Checks player's regions after a teleport, for instance.
*/
void
update_player_regions()
@@ -552,7 +552,7 @@
/*
* Change monster pointer in regions
* This happens, for instance, when a monster grows and
- * need a new structure (internally that is).
+ * needs a new structure (internally, that is).
*/
void
replace_mon_regions(monold, monnew)
@@ -568,7 +568,7 @@
}
/*
- * Remove monster from all regions it was in (ie monster just died)
+ * Remove monster from all regions it was in (i.e., monster just died)
*/
void
remove_mon_from_regions(mon)
@@ -904,7 +904,7 @@
reg = (NhRegion *) p1;
dam = (int) reg->arg;
- if (p2 == NULL) { /* This means *YOU* Bozo! */
+ if (p2 == NULL) { /* This means *YOU*, Bozo! */
if (nonliving(youmonst.data) || Breathless)
return FALSE;
if (!Blind)
@@ -921,7 +921,7 @@
} else { /* A monster is inside the cloud */
mtmp = (struct monst *) p2;
- /* Non living and non breathing monsters are not concerned */
+ /* Non-living and non-breathing monsters are not concerned */
if (!nonliving(mtmp->data) && !breathless(mtmp->data)) {
if (cansee(mtmp->mx, mtmp->my))
pline("%s coughs!", Monnam(mtmp));
diff -Ndur nethack-3.4.3/src/restore.c nethack-patched/src/restore.c
--- nethack-3.4.3/src/restore.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/restore.c 2006-04-06 23:24:28.000000000 +0000
@@ -996,7 +996,7 @@
#ifdef ZEROCOMP
-#define RLESC '\0' /* Leading character for run of RLESC's */
+#define RLESC '\0' /* Leading character for run of RLESCs */
#ifndef ZEROCOMP_BUFSIZ
#define ZEROCOMP_BUFSIZ BUFSZ
diff -Ndur nethack-3.4.3/src/role.c nethack-patched/src/role.c
--- nethack-3.4.3/src/role.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/role.c 2006-04-06 23:27:00.000000000 +0000
@@ -18,8 +18,8 @@
* and distance themselves from their attackers. --LSZ
*
* With the introduction of races, some hit points and energy
- * has been reallocated for each race. The values assigned
- * to the roles has been reduced by the amount allocated to
+ * have been reallocated for each race. The values assigned
+ * to the roles have been reduced by the amount allocated to
* humans. --KMH
*
* God names use a leading underscore to flag goddesses.
diff -Ndur nethack-3.4.3/src/save.c nethack-patched/src/save.c
--- nethack-3.4.3/src/save.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/save.c 2006-04-09 03:18:56.000000000 +0000
@@ -66,7 +66,7 @@
#endif
if(dosave0()) {
program_state.something_worth_saving = 0;
- u.uhp = -1; /* universal game's over indicator */
+ u.uhp = -1; /* universal "game's over" indicator */
/* make sure they see the Saving message */
display_nhwindow(WIN_MESSAGE, TRUE);
exit_nhwindows("Be seeing you...");
@@ -338,7 +338,7 @@
* it and avoid restoring from outdated information.
*
* Restricting havestate to this routine means that an additional
- * noop pid rewriting will take place on the first "checkpoint" after
+ * no-op pid rewriting will take place on the first "checkpoint" after
* the game is started or restored, if checkpointing is off.
*/
if (flags.ins_chkpt || havestate) {
@@ -562,7 +562,7 @@
* file is written out.
*/
-#define RLESC '\0' /* Leading character for run of LRESC's */
+#define RLESC '\0' /* Leading character for run of LRESCs */
#define flushoutrun(ln) (bputc(RLESC), bputc(ln), ln = -1)
#ifndef ZEROCOMP_BUFSIZ
@@ -916,7 +916,7 @@
bwrite(fd, (genericptr_t)nulls, sizeof(struct trap));
}
-/* save all the fruit names and ID's; this is used only in saving whole games
+/* save all the fruit names and IDs; this is used only in saving whole games
* (not levels) and in saving bones levels. When saving a bones level,
* we only want to save the fruits which exist on the bones level; the bones
* level routine marks nonexistent fruits by making the fid negative.
diff -Ndur nethack-3.4.3/src/shk.c nethack-patched/src/shk.c
--- nethack-3.4.3/src/shk.c 2005-11-18 23:36:54.000000000 +0000
+++ nethack-patched/src/shk.c 2006-04-09 14:06:26.000000000 +0000
@@ -82,7 +82,7 @@
shopkeepers, priests, oracle, succubus, & other demons.
Simple with only gold coins.
This routine will handle money changing when multiple
- coin types is implemented, only appropriate
+ coin types are implemented; only appropriate
monsters will pay change. (Peaceful shopkeepers, priests
& the oracle try to maintain goodwill while selling
their wares or services. Angry monsters and all demons
@@ -119,7 +119,7 @@
/*
Transfer money from monster to inventory.
- Used when the shopkeeper pay for items, and when
+ Used when the shopkeeper pays for items, and when
the priest gives you money for an ale.
*/
void
@@ -235,7 +235,7 @@
}
}
-/* do shopkeeper specific structure munging -dlc */
+/* do shopkeeper-specific structure munging -dlc */
void
restshk(shkp, ghostly)
struct monst *shkp;
@@ -247,7 +247,7 @@
if (eshkp->bill_p != (struct bill_x *) -1000)
eshkp->bill_p = &eshkp->bill[0];
/* shoplevel can change as dungeons move around */
- /* savebones guarantees that non-homed shk's will be gone */
+ /* savebones guarantees that non-homed shks will be gone */
if (ghostly) {
assign_level(&eshkp->shoplevel, &u.uz);
if (ANGRY(shkp) && strncmpi(eshkp->customer, plname, PL_NSIZ))
@@ -617,7 +617,7 @@
}
/*
- Decide whether two unpaid items are mergable; caller is responsible for
+ Decide whether two unpaid items are mergeable; caller is responsible for
making sure they're unpaid and the same type of object; we check the price
quoted by the shopkeeper and also that they both belong to the same shk.
*/
@@ -627,7 +627,7 @@
{
register struct monst *shkp1, *shkp2;
register struct bill_x *bp1 = 0, *bp2 = 0;
- register boolean are_mergable = FALSE;
+ register boolean are_mergeable = FALSE;
/* look up the first object by finding shk whose bill it's on */
for (shkp1 = next_shkp(fmon, TRUE); shkp1;
@@ -643,8 +643,8 @@
}
if (!bp1 || !bp2) impossible("same_price: object wasn't on any bill!");
- else are_mergable = (shkp1 == shkp2 && bp1->price == bp2->price);
- return are_mergable;
+ else are_mergeable = (shkp1 == shkp2 && bp1->price == bp2->price);
+ return are_mergeable;
}
/*
@@ -1105,8 +1105,8 @@
multi = 0;
- /* find how many shk's there are, how many are in */
- /* sight, and are you in a shop room with one. */
+ /* find how many shks there are, how many are in */
+ /* sight, and are you in a shop room with one. */
nxtm = resident = 0;
for (shkp = next_shkp(fmon, FALSE);
shkp; shkp = next_shkp(shkp->nmon, FALSE)) {
@@ -1577,7 +1577,7 @@
obj->unpaid = 1;
bp->useup = 0;
buy = PAY_SOME;
- } else { /* completely used-up, so get rid of it */
+ } else { /* completely used up, so get rid of it */
obj_extract_self(obj);
/* assert( obj == *obj_p ); */
dealloc_obj(obj);
@@ -1810,7 +1810,7 @@
/*
* Look for o_id on all lists but billobj. Return obj or NULL if not found.
- * Its OK for restore_timers() to call this function, there should not
+ * Its OK for restore_timers() to call this function; there should not
* be any timeouts on the billobjs chain.
*/
struct obj *
@@ -2039,7 +2039,7 @@
especially when gem prices are concerned */
if (!obj->dknown || !objects[obj->otyp].oc_name_known) {
if (obj->oclass == GEM_CLASS) {
- /* different shop keepers give different prices */
+ /* different shopkeepers give different prices */
if (objects[obj->otyp].oc_material == GEMSTONE ||
objects[obj->otyp].oc_material == GLASS) {
tmp = (obj->otyp % (6 - shkp->m_id % 3));
@@ -3511,7 +3511,7 @@
/* not the best introduction to the shk... */
(void) strncpy(ESHK(shkp)->customer,plname,PL_NSIZ);
- /* if the shk is already on the war path, be sure it's all out */
+ /* if the shk is already on the warpath, be sure it's all out */
if(ANGRY(shkp) || ESHK(shkp)->following) {
hot_pursuit(shkp);
return;
@@ -3827,7 +3827,7 @@
cost_per_charge(shkp, otmp, altusage)
struct monst *shkp;
struct obj *otmp;
-boolean altusage; /* some items have an "alternate" use with different cost */
+boolean altusage; /* some items have an "alternative" use with different cost */
{
long tmp = 0L;
@@ -3840,9 +3840,9 @@
if(otmp->otyp == MAGIC_LAMP) { /* 1 */
/* normal use (ie, as light source) of a magic lamp never
degrades its value, but not charging anything would make
- identifcation too easy; charge an amount comparable to
+ identification too easy; charge an amount comparable to
what is charged for an ordinary lamp (don't bother with
- angry shk surchage) */
+ angry shk surcharge) */
if (!altusage) tmp = (long) objects[OIL_LAMP].oc_cost;
else tmp += tmp / 3L; /* djinni is being released */
} else if(otmp->otyp == MAGIC_MARKER) { /* 70 - 100 */
diff -Ndur nethack-3.4.3/src/sounds.c nethack-patched/src/sounds.c
--- nethack-3.4.3/src/sounds.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/sounds.c 2006-04-24 16:56:12.000000000 +0000
@@ -435,7 +435,7 @@
if (!flags.soundok) return(0);
if (is_silent(ptr)) return(0);
- /* Make sure its your role's quest quardian; adjust if not */
+ /* Make sure it's your role's quest quardian; adjust if not */
if (ptr->msound == MS_GUARDIAN && ptr != &mons[urole.guardnum]) {
int mndx = monsndx(ptr);
ptr = &mons[genus(mndx,1)];
diff -Ndur nethack-3.4.3/src/sp_lev.c nethack-patched/src/sp_lev.c
--- nethack-3.4.3/src/sp_lev.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/sp_lev.c 2006-04-24 17:11:20.000000000 +0000
@@ -97,7 +97,7 @@
lev_init init_lev;
/*
- * Make walls of the area (x1, y1, x2, y2) non diggable/non passwall-able
+ * Make walls of the area (x1, y1, x2, y2) non-diggable/non-passwall-able
*/
STATIC_OVL void
@@ -157,9 +157,9 @@
* if x or y is -11, we generate a random coordinate.
* if x or y is between -1 and -10, we read one from the corresponding
* register (x0, x1, ... x9).
- * if x or y is nonnegative, we convert it from relative to the local map
+ * if x or y is non-negative, we convert it from relative to the local map
* to global coordinates.
- * The "humidity" flag is used to insure that engravings aren't
+ * The "humidity" flag is used to ensure that engravings aren't
* created underwater, or eels on dry land.
*/
#define DRY 0x1
@@ -391,8 +391,7 @@
/*
* Here we will try to create a room. If some parameters are
- * random we are willing to make several try before we give
- * it up.
+ * random we are willing to make several tries before we give up.
*/
do {
xchar xborder, yborder;
@@ -400,14 +399,14 @@
xtmp = x; ytmp = y;
xaltmp = xal; yaltmp = yal;
- /* First case : a totaly random room */
+ /* First case : a totally random room */
if((xtmp < 0 && ytmp <0 && wtmp < 0 && xaltmp < 0 &&
yaltmp < 0) || vault) {
xchar hx, hy, lx, ly, dx, dy;
r1 = rnd_rect(); /* Get a random rectangle */
- if (!r1) { /* No more free rectangles ! */
+ if (!r1) { /* No more free rectangles! */
#ifdef DEBUG
debugpline("No more rects...");
#endif
@@ -466,7 +465,7 @@
if (yaltmp == -1) /* Vertical alignment is RANDOM */
yaltmp = rnd(3);
- /* Try to generate real (absolute) coordinates here! */
+ /* Try to generate real (absolute) coordinates here */
xabs = (((xtmp-1) * COLNO) / 5) + 1;
yabs = (((ytmp-1) * ROWNO) / 5) + 1;
@@ -500,7 +499,7 @@
if (yabs < 2)
yabs = 2;
- /* Try to find a rectangle that fit our room ! */
+ /* Try to find a rectangle that fits our room */
r2.lx = xabs-1; r2.ly = yabs-1;
r2.hx = xabs + wtmp + rndpos;
@@ -508,7 +507,7 @@
r1 = get_rect(&r2);
}
} while (++trycnt <= 100 && !r1);
- if (!r1) { /* creation of room failed ? */
+ if (!r1) { /* creation of room failed? */
return FALSE;
}
split_rects(r1, &r2);
@@ -959,7 +958,7 @@
case 2: unbless(otmp); uncurse(otmp); break; /* uncursed */
case 3: curse(otmp); break; /* CURSED */
default: break; /* Otherwise it's random and we're happy
- * with what mkobj gave us! */
+ * with what mkobj gave us */
}
/* corpsenm is "empty" if -1, random if -2, otherwise specific */
@@ -1139,7 +1138,7 @@
if (!croom_is_temple || !a->shrine) return;
- if (a->shrine) { /* Is it a shrine or sanctum? */
+ if (a->shrine) { /* Is it a shrine or sanctum? */
priestini(&u.uz, croom, x, y, (a->shrine > 1));
levl[x][y].altarmask |= AM_SHRINE;
level.flags.has_temple = TRUE;
@@ -1411,11 +1410,10 @@
}
/*
- * Corridors always start from a door. But it can end anywhere...
- * Basically we search for door coordinates or for endpoints coordinates
+ * Corridors always start from a door. But they can end anywhere...
+ * Basically we search for door coordinates or for endpoint coordinates
* (from a distance).
*/
-
STATIC_OVL void
create_corridor(c)
corridor *c;
@@ -1457,7 +1455,6 @@
/*
* Fill a room (shop, zoo, etc...) with appropriate stuff.
*/
-
void
fill_room(croom, prefilled)
struct mkroom *croom;
@@ -1727,7 +1724,7 @@
mkmap(&init_lev);
}
- /* Read the per level flags */
+ /* Read the per-level flags */
Fread((genericptr_t) &lev_flags, 1, sizeof(lev_flags), fd);
if (lev_flags & NOTELEPORT)
level.flags.noteleport = 1;
@@ -1867,7 +1864,7 @@
Fread((genericptr_t) &r->rtype, 1, sizeof(r->rtype), fd);
/* type of room (zoo, shop, etc.) */
Fread((genericptr_t) &r->chance, 1, sizeof(r->chance), fd);
- /* chance of room being special. */
+ /* chance of room being special */
Fread((genericptr_t) &r->rlit, 1, sizeof(r->rlit), fd);
/* lit or not ? */
Fread((genericptr_t) &r->filled, 1, sizeof(r->filled), fd);
@@ -2150,8 +2147,8 @@
}
/*
- * If any CROSSWALLs are found, must change to ROOM after REGION's
- * are laid out. CROSSWALLS are used to specify "invisible"
+ * If any CROSSWALLs are found, must change to ROOM after REGIONs
+ * are laid out. CROSSWALLs are used to specify "invisible"
* boundaries where DOOR syms look bad or aren't desirable.
*/
has_bounds = FALSE;
@@ -2351,7 +2348,7 @@
}
levl[x][y].doormask = typ;
- /* Now the complicated part, list it with each subroom */
+ /* Now the complicated part: list it with each subroom */
/* The dog move and mail daemon routines use this */
while(croom->hx >= 0 && doorindex < DOORMAX) {
if(croom->hx >= x-1 && croom->lx <= x+1 &&
@@ -2643,7 +2640,7 @@
if (!check_version(&vers_info, name, TRUE))
goto give_up;
- Fread((genericptr_t) &c, sizeof c, 1, fd); /* c Header */
+ Fread((genericptr_t) &c, sizeof c, 1, fd); /* c is a header */
switch (c) {
case SP_LEV_ROOMS:
diff -Ndur nethack-3.4.3/src/spell.c nethack-patched/src/spell.c
--- nethack-3.4.3/src/spell.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/spell.c 2006-04-24 17:25:48.000000000 +0000
@@ -48,9 +48,9 @@
* Pri are very aware of healing magic through theological research
* Ran avoid magic, preferring to fight unseen and unheard
* Rog are moderately aware of magic through trickery
- * Sam have limited magical awareness, prefering meditation to conjuring
+ * Sam have limited magical awareness, preferring meditation to conjuring
* Tou are aware of magic from all the great films they have seen
- * Val have limited magical awareness, prefering fighting
+ * Val have limited magical awareness, preferring fighting
* Wiz are trained mages
*
* The arms penalty is lessened for trained fighters Bar, Kni, Ran,
@@ -80,7 +80,7 @@
* Fighters find body armour & shield a little less limiting.
* Headgear, Gauntlets and Footwear are not role-specific (but
* still have an effect, except helm of brilliance, which is designed
- * to permit magic-use).
+ * to permit magic use).
*/
#define uarmhbon 4 /* Metal helmets interfere with the mind */
@@ -182,7 +182,7 @@
boolean gone = FALSE;
if (!rn2(3) && spellbook->otyp != SPE_BOOK_OF_THE_DEAD) {
- spellbook->in_use = TRUE; /* in case called from learn */
+ spellbook->in_use = TRUE; /* in case called from learn() */
pline(
"Being confused you have difficulties in controlling your actions.");
display_nhwindow(WIN_MESSAGE, FALSE);
@@ -199,7 +199,7 @@
return gone;
}
-/* special effects for The Book of the Dead */
+/* special effects for the Book of the Dead */
STATIC_OVL void
deadbook(book2)
struct obj *book2;
@@ -274,7 +274,7 @@
mtmp->mpeaceful = 0;
set_malign(mtmp);
}
- /* next handle the affect on things you're carrying */
+ /* next handle the effect on things you're carrying */
(void) unturn_dead(&youmonst);
/* last place some monsters around you */
mm.x = u.ux;
@@ -453,7 +453,7 @@
return(1);
}
}
- /* its up to random luck now */
+ /* it's up to random luck now */
if (rnd(20) > read_ability) {
too_hard = TRUE;
}
@@ -503,7 +503,7 @@
if (obj == book) book = (struct obj *)0;
}
-/* renaming an object usually results in it having a different address;
+/* renaming an object usually results in its having a different address;
so the sequence start reading, get interrupted, name the book, resume
reading would read the "new" book from scratch */
void
@@ -521,7 +521,7 @@
/*
* The time relative to the hero (a pass through move
* loop) causes all spell knowledge to be decremented.
- * The hero's speed, rest status, conscious status etc.
+ * The hero's speed, rest status, conscious status, etc.
* does not alter the loss of memory.
*/
for (i = 0; i < MAXSPELL && spellid(i) != NO_SPELL; i++)
@@ -821,7 +821,7 @@
/*
* At first spells act as expected. As the hero increases in skill
* with the appropriate spell type, some spells increase in their
- * effects, e.g. more damage, further distance, and so on, without
+ * effects, e.g. more damage, greater distance, and so on, without
* additional cost to the spellcaster.
*/
case SPE_CONE_OF_COLD:
@@ -1062,12 +1062,12 @@
/*
* The correct spacing of the columns depends on the
- * following that (1) the font is monospaced and (2)
- * that selection letters are pre-pended to the given
+ * following: (1) that the font is monospaced and (2)
+ * that selection letters are prepended to the given
* string and are of the form "a - ".
*
* To do it right would require that we implement columns
- * in the window-ports (say via a tab character).
+ * in the window-ports (say, via a tab character).
*/
if (!iflags.menu_tab_sep)
Sprintf(buf, "%-20s Level %-12s Fail", " Name", "Category");
@@ -1134,7 +1134,7 @@
int spell;
{
/* Intrinsic and learned ability are combined to calculate
- * the probability of player's success at cast a given spell.
+ * the probability of player's success at casting a given spell.
*/
int chance, splcaster, special, statused;
int difficulty;
@@ -1174,13 +1174,13 @@
/* Calculate learned ability */
- /* Players basic likelihood of being able to cast any spell
- * is based of their `magic' statistic. (Int or Wis)
+ /* The player's basic likelihood of being able to cast any
+ * spell is based of their `magic' statistic. (Int or Wis)
*/
chance = 11 * statused / 2;
/*
- * High level spells are harder. Easier for higher level casters.
+ * High-level spells are harder. Easier for higher-level casters.
* The difficulty is based on the hero's level and their skill level
* in that spell type.
*/
diff -Ndur nethack-3.4.3/src/steal.c nethack-patched/src/steal.c
--- nethack-3.4.3/src/steal.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/steal.c 2006-04-24 19:10:54.000000000 +0000
@@ -29,7 +29,7 @@
long /* actually returns something that fits in an int */
somegold()
{
-#ifdef LINT /* long conv. ok */
+#ifdef LINT /* long conv. OK */
return(0L);
#else
return (long)( (u.ugold < 100) ? u.ugold :
@@ -72,7 +72,7 @@
somegold(umoney)
long umoney;
{
-#ifdef LINT /* long conv. ok */
+#ifdef LINT /* long conv. OK */
return(0L);
#else
return (long)( (umoney < 100) ? umoney :
@@ -409,7 +409,7 @@
/* do this before removing it from inventory */
if (objnambuf) Strcpy(objnambuf, yname(otmp));
/* set mavenge bit so knights won't suffer an
- * alignment penalty during retaliation;
+ * alignment penalty during retaliation
*/
mtmp->mavenge = 1;
@@ -446,7 +446,7 @@
boolean snuff_otmp = FALSE;
/* don't want hidden light source inside the monster; assumes that
engulfers won't have external inventories; whirly monsters cause
- the light to be extinguished rather than letting it shine thru */
+ the light to be extinguished rather than letting it shine through */
if (otmp->lamplit && /* hack to avoid function calls for most objs */
obj_sheds_light(otmp) &&
attacktype(mtmp->data, AT_ENGL)) {
@@ -506,8 +506,8 @@
if (otmp->owornmask)
remove_worn_item(otmp, TRUE);
freeinv(otmp);
- /* mpickobj wont merge otmp because none of the above things
- to steal are mergable */
+ /* mpickobj won't merge otmp because none of the above things
+ to steal are mergeable */
(void) mpickobj(mtmp,otmp); /* may merge and free otmp */
pline("%s stole %s!", Monnam(mtmp), doname(otmp));
if (can_teleport(mtmp->data) && !tele_restrict(mtmp))
@@ -597,7 +597,7 @@
if (otmp->owornmask || otmp == wep ||
((!item1 && otmp->otyp == PICK_AXE) ||
(!item2 && otmp->otyp == UNICORN_HORN && !otmp->cursed))) {
- if (is_pet) { /* dont drop worn/wielded item */
+ if (is_pet) { /* don't drop worn/wielded item */
if (otmp->otyp == PICK_AXE)
item1 = TRUE;
if (otmp->otyp == UNICORN_HORN && !otmp->cursed)
diff -Ndur nethack-3.4.3/src/steed.c nethack-patched/src/steed.c
--- nethack-3.4.3/src/steed.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/steed.c 2006-04-24 17:37:22.000000000 +0000
@@ -141,7 +141,7 @@
You("put the saddle on %s.", mon_nam(mtmp));
if (otmp->owornmask) remove_worn_item(otmp, FALSE);
freeinv(otmp);
- /* mpickobj may free otmp it if merges, but we have already
+ /* mpickobj may free otmp if it merges, but we have already
checked for a saddle above, so no merger should happen */
(void) mpickobj(mtmp, otmp);
mtmp->misc_worn_check |= W_SADDLE;
@@ -207,8 +207,8 @@
pline("Maybe you should find a designated driver.");
return (FALSE);
}
- /* While riding Wounded_legs refers to the steed's,
- * not the hero's legs.
+ /* While riding, Wounded_legs refers to the steed's,
+ * not the hero's, legs.
* That opens up a potential abuse where the player
* can mount a steed, then dismount immediately to
* heal leg damage, because leg damage is always
@@ -460,7 +460,7 @@
/* Stop riding the current steed */
void
dismount_steed(reason)
- int reason; /* Player was thrown off etc. */
+ int reason; /* Player was thrown off, etc. */
{
struct monst *mtmp;
struct obj *otmp;
@@ -576,7 +576,7 @@
* involve having these functions not call pickup() at all, instead
* calling them first and calling pickup() afterwards. But it
* would take a lot of work to keep this change from having any
- * unforseen side effects (for instance, you would no longer be
+ * unforeseen side effects (for instance, you would no longer be
* able to walk onto a square with a hole, and autopickup before
* falling into the hole).
*/
diff -Ndur nethack-3.4.3/src/teleport.c nethack-patched/src/teleport.c
--- nethack-3.4.3/src/teleport.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/teleport.c 2006-04-24 19:11:16.000000000 +0000
@@ -90,7 +90,7 @@
*
* Attempt to find a good place for the given monster type in the closest
* position to (xx,yy). Do so in successive square rings around (xx,yy).
- * If there is more than one valid positon in the ring, choose one randomly.
+ * If there is more than one valid position in the ring, choose one randomly.
* Return TRUE and the position chosen when successful, FALSE otherwise.
*/
boolean
@@ -238,7 +238,7 @@
* otherwise they are teleporting, so unplacebc().
* If they don't have to move the ball, then always "drag" whether or
* not allow_drag is true, because we are calling that function, not
- * to drag, but to move the chain. *However* there are some dumb
+ * to drag, but to move the chain. *However*, there are some dumb
* special cases:
* 0 0
* _X move east -----> X_
@@ -659,20 +659,20 @@
return;
}
- /* if in Knox and the requested level > 0, stay put.
- * we let negative values requests fall into the "heaven" loop.
+ /* If in Knox and the requested level > 0, stay put.
+ * We let negative values requests fall into the "heaven" loop.
*/
if (Is_knox(&u.uz) && newlev > 0) {
You(shudder_for_moment);
return;
}
- /* if in Quest, the player sees "Home 1", etc., on the status
- * line, instead of the logical depth of the level. controlled
+ /* If in Quest, the player sees "Home 1", etc., on the status
+ * line, instead of the logical depth of the level. Controlled
* level teleport request is likely to be relativized to the
* status line, and consequently it should be incremented to
* the value of the logical depth of the target level.
*
- * we let negative values requests fall into the "heaven" loop.
+ * We let negative values requests fall into the "heaven" loop.
*/
if (In_quest(&u.uz) && newlev > 0)
newlev = newlev + dungeons[u.uz.dnum].depth_start - 1;
@@ -748,7 +748,7 @@
d_level lsav;
/* set specific death location; this also suppresses bones */
- lsav = u.uz; /* save current level, see below */
+ lsav = u.uz; /* save current level; see below */
u.uz.dnum = 0; /* main dungeon */
u.uz.dlevel = (newlev <= -10) ? -10 : 0; /* heaven or surface */
done(DIED);
@@ -774,7 +774,7 @@
#endif
find_hell(&newlevel);
} else {
- /* if invocation did not yet occur, teleporting into
+ /* If invocation did not yet occur, teleporting into
* the last level of Gehennom is forbidden.
*/
#ifdef WIZARD
@@ -822,7 +822,7 @@
You("activated a magic portal!");
- /* prevent the poor shnook, whose amulet was stolen while in
+ /* prevent the poor shnook, whose Amulet was stolen while in
* the endgame, from accidently triggering the portal to the
* next level, and thus losing the game
*/
@@ -918,7 +918,7 @@
/* current location is <xx,yy> */
if (!tele_jump_ok(xx, yy, x, y)) return FALSE;
}
- /* <x,y> is ok */
+ /* <x,y> is OK */
return TRUE;
}
@@ -1013,7 +1013,7 @@
goto found_xy;
} while (++trycount < 1000);
- /* last ditch attempt to find a good place */
+ /* last-ditch attempt to find a good place */
for (x = 2; x < COLNO - 1; x++)
for (y = 0; y < ROWNO; y++)
if (goodpos(x, y, mtmp, 0))
@@ -1232,7 +1232,7 @@
* message ("disoriented").
* --KAA
* 3.4.2: explicitly handle quest here too, to fix the problem of
- * monsters sometimes level teleporting out of it into main dungeon.
+ * monsters sometimes level-teleporting out of it into main dungeon.
* Also prevent monsters reaching the Sanctum prior to invocation.
*/
min_depth = In_quest(&u.uz) ? dungeons[u.uz.dnum].depth_start : 1;
diff -Ndur nethack-3.4.3/src/timeout.c nethack-patched/src/timeout.c
--- nethack-3.4.3/src/timeout.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/timeout.c 2006-04-24 18:02:42.000000000 +0000
@@ -172,7 +172,8 @@
/* Cursed luckstones stop bad luck from timing out; blessed luckstones
* stop good luck from timing out; normal luckstones stop both;
* neither is stopped if you don't have a luckstone.
- * Luck is based at 0 usually, +1 if a full moon and -1 on Friday 13th
+ * Luck is based at 0 usually, +1 if a full moon and -1 on Friday
+ * the 13th
*/
register int time_luck = stone_luck(FALSE);
boolean nostone = !carrying(LUCKSTONE) && !stone_luck(TRUE);
@@ -331,7 +332,7 @@
nomovemsg = "";
/* The more you are carrying the more likely you
* are to make noise when you fumble. Adjustments
- * to this number must be thoroughly play tested.
+ * to this number must be thoroughly playtested.
*/
if ((inv_weight() > -500)) {
You("make a lot of noise!");
@@ -473,9 +474,9 @@
We can do several things. The first ones that come to
mind are:
- + Create the hatched monster then place it on the migrating
- mons list. This is tough because all makemon() is made
- to place the monster as well. Makemon() also doesn't
+ + Create the hatched monster, then place it on the migrating
+ mons list. This is tough because makemon() is made
+ to place the monster as well. Makemon() also doesn't
lend itself well to splitting off a "not yet placed"
subroutine.
@@ -535,7 +536,7 @@
case OBJ_MINVENT:
if (cansee_hatchspot) {
- /* egg carring monster might be invisible */
+ /* egg carrying monster might be invisible */
if (canseemon(egg->ocarry)) {
Sprintf(carriedby, "%s pack",
s_suffix(a_monnam(egg->ocarry)));
@@ -629,7 +630,7 @@
if (otmp && on_foot) { /* trip over something in particular */
/*
If there is only one item, it will have just been named
- during the move, so refer to by via pronoun; otherwise,
+ during the move, so refer to it by pronoun; otherwise,
if the top item has been or can be seen, refer to it by
name; if not, look for rocks to trip over; trip over
anonymous "something" if there aren't any rocks.
@@ -873,7 +874,7 @@
default:
/*
* Someone added fuel to the lamp while it was
- * lit. Just fall through and let begin burn
+ * lit. Just fall through and let begin_burn
* handle the new age.
*/
break;
@@ -990,7 +991,7 @@
default:
/*
* Someone added fuel (candles) to the menorah while
- * it was lit. Just fall through and let begin burn
+ * it was lit. Just fall through and let begin_burn
* handle the new age.
*/
break;
@@ -1097,7 +1098,7 @@
do_timer = FALSE;
radius = 2;
} else {
- impossible("begin burn: unexpected %s", xname(obj));
+ impossible("begin_burn: unexpected %s", xname(obj));
turns = obj->age;
}
break;
@@ -1216,7 +1217,7 @@
}
if(levl[u.ux][u.uy].typ == CLOUD) {
- /* inside a cloud during a thunder storm is deafening */
+ /* inside a cloud during a thunderstorm is deafening */
pline("Kaboom!!! Boom!! Boom!!");
if(!u.uinvulnerable) {
stop_occupation();
@@ -1260,7 +1261,7 @@
* Save all timers of range 'range'. Range is either global
* or local. Global timers follow game play, local timers
* are saved with a level. Object and monster timers are
- * saved using their respective id's instead of pointers.
+ * saved using their respective ids instead of pointers.
*
* void restore_timers(int fd, int range, boolean ghostly, long adjust)
* Restore timers of range 'range'. If from a ghost pile,
@@ -1420,7 +1421,7 @@
/*
* Always use the first element. Elements may be added or deleted at
- * any time. The list is ordered, we are done when the first element
+ * any time. The list is ordered; we are done when the first element
* is in the future.
*/
while (timer_base && timer_base->timeout <= monstermoves) {
@@ -1758,7 +1759,7 @@
* + timeouts that follow obj & monst that are migrating
*
* Level range:
- * + timeouts that are level specific (e.g. storms)
+ * + timeouts that are level-specific (e.g. storms)
* + timeouts that stay with the level (obj & monst)
*/
void
diff -Ndur nethack-3.4.3/src/topten.c nethack-patched/src/topten.c
--- nethack-3.4.3/src/topten.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/topten.c 2006-04-24 18:03:26.000000000 +0000
@@ -18,7 +18,7 @@
/*
* Updating in place can leave junk at the end of the file in some
- * circumstances (if it shrinks and the O.S. doesn't have a straightforward
+ * circumstances (if it shrinks and the OS doesn't have a straightforward
* way to truncate it). The trailing junk is harmless and the code
* which reads the scores will ignore it.
*/
diff -Ndur nethack-3.4.3/src/track.c nethack-patched/src/track.c
--- nethack-3.4.3/src/track.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/track.c 2006-04-24 18:08:16.000000000 +0000
@@ -47,7 +47,7 @@
else tc--;
ndist = distmin(x,y,tc->x,tc->y);
- /* if far away, skip track entries til we're closer */
+ /* if far away, skip track entries till we're closer */
if(ndist > 2) {
ndist -= 2; /* be careful due to extra decrement at top of loop */
cnt -= ndist;
diff -Ndur nethack-3.4.3/src/trap.c nethack-patched/src/trap.c
--- nethack-3.4.3/src/trap.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/trap.c 2006-04-24 18:21:06.000000000 +0000
@@ -294,7 +294,7 @@
/*
* some cases which can happen when digging
- * down while phazing thru solid areas
+ * down while phasing through solid areas
*/
else if (lev->typ == STONE || lev->typ == SCORR)
lev->typ = CORR;
@@ -1004,7 +1004,7 @@
}
u.utraptype = TT_WEB;
- /* Time stuck in the web depends on your/steed strength. */
+ /* Time stuck in the web depends on your/steed's strength. */
{
register int str = ACURR(A_STR);
@@ -1128,9 +1128,9 @@
already_seen ? " land mine" : "it");
} else {
#ifdef STEED
- /* prevent landmine from killing steed, throwing you to
- * the ground, and you being affected again by the same
- * mine because it hasn't been deleted yet
+ /* prevent landmine from killing steed, throwing you
+ * to the ground, and affecting you again because it
+ * hasn't been deleted yet
*/
static boolean recursive_mine = FALSE;
@@ -1349,7 +1349,7 @@
newsym(x1,y1);
/* in case you're using a pick-axe to chop the boulder that's being
launched (perhaps a monster triggered it), destroy context so that
- next dig attempt never thinks you're resuming previous effort */
+ the next dig attempt never thinks you're resuming previous effort */
if ((otyp == BOULDER || otyp == STATUE) &&
singleobj->ox == digging.pos.x && singleobj->oy == digging.pos.y)
(void) memset((genericptr_t)&digging, 0, sizeof digging);
@@ -2385,7 +2385,7 @@
* is based on air currents. This is
* consistent with that.
* The unexpected additional force of the
- * air currents once leviation
+ * air currents once levitation
* ceases knocks you off your feet.
*/
You("fall over.");
@@ -3171,7 +3171,7 @@
set_malign(mtmp); /* reset alignment */
pline("%s is grateful.", Monnam(mtmp));
}
- /* Helping someone out of a trap is a nice thing to do,
+ /* Helping someone out of a trap is a nice thing to do.
* A lawful may be rewarded, but not too often. */
if (!rn2(3) && !rnl(8) && u.ualign.type == A_LAWFUL) {
adjalign(1);
diff -Ndur nethack-3.4.3/src/u_init.c nethack-patched/src/u_init.c
--- nethack-3.4.3/src/u_init.c 2005-11-18 23:36:56.000000000 +0000
+++ nethack-patched/src/u_init.c 2006-04-24 19:25:32.000000000 +0000
@@ -133,7 +133,7 @@
{ KATANA, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
{ SHORT_SWORD, 0, WEAPON_CLASS, 1, UNDEF_BLESS }, /* wakizashi */
{ YUMI, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
- { YA, 0, WEAPON_CLASS, 25, UNDEF_BLESS }, /* variable quan */
+ { YA, 0, WEAPON_CLASS, 25, UNDEF_BLESS }, /* quan is variable */
{ SPLINT_MAIL, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
{ 0, 0, 0, 0, 0 }
};
@@ -590,8 +590,8 @@
#endif
/*
- * For now, everyone starts out with a night vision range of 1 and
- * their xray range disabled.
+ * For now, everyone starts out with a night vision range of 1
+ * and their x-ray range disabled.
*/
u.nv_range = 1;
u.xray_range = -1;
@@ -956,8 +956,8 @@
if (objects[otyp].oc_charged && obj->spe <= 0)
obj->spe = rne(3);
- /* Heavily relies on the fact that 1) we create wands
- * before rings, 2) that we create rings before
+ /* Heavily relies on the facts that 1) we create wands
+ * before rings, that 2) we create rings before
* spellbooks, and that 3) not more than 1 object of a
* particular symbol is to be prohibited. (For more
* objects, we need more nocreate variables...)
diff -Ndur nethack-3.4.3/src/uhitm.c nethack-patched/src/uhitm.c
--- nethack-3.4.3/src/uhitm.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/uhitm.c 2006-04-24 19:04:16.000000000 +0000
@@ -106,7 +106,7 @@
if (u.uswallow && mtmp == u.ustuck) return FALSE;
if (flags.forcefight) {
- /* Do this in the caller, after we checked that the monster
+ /* Do this in the caller, after we check that the monster
* didn't die from the blow. Reason: putting the 'I' there
* causes the hero to forget the square's contents since
* both 'I' and remembered contents are stored in .glyph.
@@ -301,8 +301,8 @@
* Protection is provided as long as player is not: blind, confused,
* hallucinating or stunned.
* changes by wwp 5/16/85
- * More changes 12/90, -dkh-. if its tame and safepet, (and protected
- * 07/92) then we assume that you're not trying to attack. Instead,
+ * More changes 12/90, -dkh-. if it's tame and safepet (and protected
+ * 07/92), then we assume that you're not trying to attack. Instead,
* you'll usually just swap places if this is a movement command
*/
/* Intelligent chaotic weapons (Stormbringer) want blood */
@@ -660,7 +660,7 @@
if (thrown && (is_ammo(obj) || is_missile(obj))) {
if (ammo_and_launcher(obj, uwep)) {
/* Elves and Samurai do extra damage using
- * their bows&arrows; they're highly trained.
+ * their bows & arrows; they're highly trained.
*/
if (Role_if(PM_SAMURAI) &&
obj->otyp == YA && uwep->otyp == YUMI)
@@ -988,7 +988,7 @@
if (!already_killed) mon->mhp -= tmp;
/* adjustments might have made tmp become less than what
- a level draining artifact has already done to max HP */
+ a level-draining artifact has already done to max HP */
if (mon->mhp > mon->mhpmax) mon->mhp = mon->mhpmax;
if (mon->mhp < 1)
destroyed = TRUE;
@@ -1183,11 +1183,11 @@
/*
* Player uses theft attack against monster.
*
- * If the target is wearing body armor, take all of its possesions;
+ * If the target is wearing body armor, take all of its possessions;
* otherwise, take one object. [Is this really the behavior we want?]
*
* This routine implicitly assumes that there is no way to be able to
- * resist petfication (ie, be polymorphed into a xorn or golem) at the
+ * resist petrification (ie, be polymorphed into a xorn or golem) at the
* same time as being able to steal (poly'd into nymph or succubus).
* If that ever changes, the check for touching a cockatrice corpse
* will need to be smarter about whether to break out of the theft loop.
@@ -1406,7 +1406,7 @@
Your("purse feels heavier.");
}
#else
- /* This you as a leprechaun, so steal
+ /* This is you as a leprechaun, so steal
real gold only, no lesser coins */
{
struct obj *mongold = findgold(mdef->minvent);
diff -Ndur nethack-3.4.3/src/vault.c nethack-patched/src/vault.c
--- nethack-3.4.3/src/vault.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/vault.c 2006-04-24 19:11:52.000000000 +0000
@@ -143,7 +143,7 @@
vaultroom -= ROOMOFFSET;
guard = findgd();
- if(++u.uinvault % 30 == 0 && !guard) { /* if time ok and no guard now. */
+ if(++u.uinvault % 30 == 0 && !guard) { /* if time OK and no guard now */
char buf[BUFSZ];
register int x, y, dd, gx, gy;
int lx = 0, ly = 0;
@@ -253,7 +253,7 @@
if (Strangled || is_silent(youmonst.data) || multi < 0) {
/* [we ought to record whether this this message has already
been given in order to vary it upon repeat visits, but
- discarding the monster and its egd data renders that hard] */
+ discarding the monster and its EGD data renders that hard] */
verbalize("I'll be back when you're ready to speak to me!");
mongone(guard);
return;
diff -Ndur nethack-3.4.3/src/version.c nethack-patched/src/version.c
--- nethack-3.4.3/src/version.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/version.c 2006-04-24 19:16:38.000000000 +0000
@@ -98,7 +98,7 @@
return TRUE;
}
-/* this used to be based on file date and somewhat OS-dependant,
+/* this used to be based on file date and somewhat OS-dependent,
but now examines the initial part of the file's contents */
boolean
uptodate(fd, name)
--- nethack-3.4.3/src/vision.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/vision.c 2006-05-14 16:48:42.000000000 +0000
@@ -42,7 +42,7 @@
};
/*
- * These are the starting indexes into the circle_data[] array for a
+ * These are the starting indices into the circle_data[] array for a
* circle of a given radius.
*/
char circle_start[] = {
@@ -175,7 +175,7 @@
for (obj = level.objects[x][y]; obj; obj = obj->nexthere)
if (obj->otyp == BOULDER) return 1;
- /* Mimics mimicing a door or boulder block light. */
+ /* Mimics mimicking a door or boulder block light. */
if ((mon = m_at(x,y)) && (!mon->minvis || See_invisible) &&
((mon->m_ap_type == M_AP_FURNITURE &&
(mon->mappearance == S_hcdoor || mon->mappearance == S_vcdoor)) ||
@@ -287,7 +287,7 @@
/*
* rogue_vision()
*
- * Set the "could see" and in sight bits so vision acts just like the old
+ * Set the "could see" and in_sight bits so vision acts just like the old
* rogue game:
*
* + If in a room, the hero can see to the room boundaries.
@@ -385,7 +385,7 @@
* this is good enough.
*
* + When this function is called we don't have all of the seen
- * information (we're doing a top down scan in vision_recalc).
+ * information (we're doing a top-down scan in vision_recalc).
* We would need to scan once to set all IN_SIGHT and COULD_SEE
* bits, then again to correctly set the seenv bits.
* + I'm trying to make this as cheap as possible. The display &
@@ -460,13 +460,13 @@
*
* Control flag = 0. A complete vision recalculation. Generate the vision
* tables from scratch. This is necessary to correctly set what the hero
- * can see. (1) and (2) call this routine for synchronization purposes, (3)
+ * can see. (1) and (2) call this routine for synchronization purposes; (3)
* calls this routine so it can operate correctly.
*
* + After the monster move, before input from the player. [moveloop()]
* + At end of moveloop. [moveloop() ??? not sure why this is here]
* + Right before something is printed. [pline()]
- * + Right before we do a vision based operation. [do_clear_area()]
+ * + Right before we do a vision-based operation. [do_clear_area()]
* + screen redraw, so we can renew all positions in sight. [docrt()]
*
* Control flag = 1. An adjacent vision recalculation. The hero has moved
@@ -498,7 +498,7 @@
char *old_row; /* row pointer for the old array */
char *next_rmin; /* min pointer for the new array */
char *next_rmax; /* max pointer for the new array */
- char *ranges; /* circle ranges -- used for xray & night vision */
+ char *ranges; /* circle ranges -- used for x-ray & night vision */
int row; /* row counter (outer loop) */
int start, stop; /* inner loop starting/stopping index */
int dx, dy; /* one step from a lit door or lit wall (see below) */
@@ -545,7 +545,7 @@
/*
* Our own version of the update loop below. We know we can't see
- * anything, so we only need update positions we used to be able
+ * anything, so we only need to update positions we used to be able
* to see.
*/
temp_array = viz_array; /* set viz_array so newsym() will work */
@@ -575,7 +575,7 @@
if (Underwater && !Is_waterlevel(&u.uz)) {
/*
- * The hero is under water. Only see surrounding locations if
+ * The hero is underwater. Only see surrounding locations if
* they are also underwater. This overrides night vision but
* does not override x-ray vision.
*/
@@ -608,7 +608,7 @@
0, (void FDECL((*),(int,int,genericptr_t)))0, (genericptr_t)0);
/*
- * Set the IN_SIGHT bit for xray and night vision.
+ * Set the IN_SIGHT bit for x-ray and night vision.
*/
if (u.xray_range >= 0) {
if (u.xray_range) {
@@ -685,7 +685,7 @@
* + Set the IN_SIGHT bit for places that we could see and are lit.
* + Reset changed places.
*
- * There is one thing that make deciding what the hero can see
+ * There is one thing that makes deciding what the hero can see
* difficult:
*
* 1. Directional lighting. Items that block light create problems.
@@ -711,7 +711,7 @@
lev += ROWNO, sv += (int) colbump[++col]) {
if (next_row[col] & IN_SIGHT) {
/*
- * We see this position because of night- or xray-vision.
+ * We see this position because of night or x-ray vision.
*/
oldseenv = lev->seenv;
lev->seenv |= new_angle(lev,sv,row,col); /* update seen angle */
@@ -732,7 +732,7 @@
* Make sure doors, walls, boulders or mimics don't show up
* at the end of dark hallways. We do this by checking
* the adjacent position. If it is lit, then we can see
- * the door or wall, otherwise we can't.
+ * the door or wall; otherwise we can't.
*/
dx = u.ux - col; dx = sign(dx);
flev = &(levl[col+dx][row+dy]);
@@ -771,16 +771,16 @@
}
/*
* At this point we know that the row position is *not* in normal
- * sight. That is, the position is could be seen, but is dark
+ * sight. That is, the position could be seen, but is dark
* or LOS is just plain blocked.
*
* Update the position if:
* o If the old one *was* in sight. We may need to clean up
- * the glyph -- E.g. darken room spot, etc.
+ * the glyph -- e.g. darken room spot, etc.
* o If we now could see the location (yet the location is not
* lit), but previously we couldn't see the location, or vice
- * versa. Update the spot because there there may be an infared
- * monster there.
+ * versa. Update the spot because there may be an
+ * infrared-visible monster there.
*/
else {
not_in_sight:
@@ -849,18 +849,18 @@
}
-/*===========================================================================*\
+/*===========================================================================*
| |
| Everything below this line uses (y,x) instead of (x,y) --- the |
| algorithms are faster if they are less recursive and can scan |
| on a row longer. |
| |
-\*===========================================================================*/
+ *===========================================================================*/
-/* ========================================================================= *\
- Left and Right Pointer Updates
-\* ========================================================================= */
+/* ========================================================================= */
+/* Left and Right Pointer Updates */
+/* ========================================================================= */
/*
* LEFT and RIGHT pointer rules
@@ -877,11 +877,11 @@
* ______________
*
* + If you are a clear spot, your left will point to the first
- * stone to your left. If there is none, then point the first
+ * stone to your left. If there is none, then point to the first
* legal position in the row (0).
*
* + If you are a blocked spot, then your left will point to the
- * left-most blocked spot to your left that is connected to you.
+ * leftmost blocked spot to your left that is connected to you.
* This means that a left-edge (a blocked spot that has an open
* spot on its left) will point to itself.
*
@@ -889,11 +889,11 @@
* Right Pointers:
* ---------------
* + If you are a clear spot, your right will point to the first
- * stone to your right. If there is none, then point the last
+ * stone to your right. If there is none, then point to the last
* legal position in the row (COLNO-1).
*
* + If you are a blocked spot, then your right will point to the
- * right-most blocked spot to your right that is connected to you.
+ * rightmost blocked spot to your right that is connected to you.
* This means that a right-edge (a blocked spot that has an open
* spot on its right) will point to itself.
*/
@@ -1081,7 +1081,7 @@
* Both Algorithms C and D use the following macros.
*
* good_row(z) - Return TRUE if the argument is a legal row.
- * set_cs(rowp,col) - Set the local could see array.
+ * set_cs(rowp,col) - Set the local "could see" array.
* set_min(z) - Save the min value of the argument and the current
* row minimum.
* set_max(z) - Save the max value of the argument and the current
@@ -1526,10 +1526,10 @@
}
#ifdef VISION_TABLES
-/*===========================================================================*\
- GENERAL LINE OF SIGHT
- Algorithm D
-\*===========================================================================*/
+/*===========================================================================*
+ | GENERAL LINE OF SIGHT |
+ | Algorithm D |
+ *===========================================================================*/
/*
@@ -1619,8 +1619,8 @@
* If the block is beyond the border, then the row is negative. Return
* the block's column number (should be 0 or COLNO-1).
*
- * Could easily have the column be -1, but then wouldn't know if it was
- * the left or right border.
+ * We could easily have the column be -1, but then we wouldn't know
+ * if it was the left or right border.
*/
if (block_row < 0) return block_col;
@@ -1662,9 +1662,9 @@
int left_shadow, right_shadow, loc_right;
int lblock_col; /* local block column (current row) */
int nrow, deeper;
- char *row_min; /* left most */
- char *row_max; /* right most */
- int lim_max; /* right most limit of circle */
+ char *row_min; /* leftmost */
+ char *row_max; /* rightmost */
+ int lim_max; /* rightmost limit of circle */
#ifdef GCC_WARN
rowp = 0;
@@ -1789,7 +1789,7 @@
/*
* We are in an opening.
*
- * If this is the first open spot since the could see area (this is
+ * If this is the first open spot since the "could see" area (this is
* true if we have hit stone), get the shadow generated by the wall
* just to our left.
*/
@@ -1801,7 +1801,7 @@
/*
* Check if the shadow covers the opening. If it does, then
- * move to end of the opening. A shadow generated on from a
+ * move to the end of the opening. A shadow generated from a
* wall on this row does *not* cover the wall on the right
* of the opening.
*/
@@ -1834,8 +1834,7 @@
* exists) on a boundary. This then makes a far block exist where it
* shouldn't --- on a boundary. To get around that, I had to
* introduce the concept of a non-existent far block (when the
- * row < 0). Next I have to check for it. Here is where that check
- * exists.
+ * row < 0). Next I have to check for it. Here is that check.
*/
if ((loc_right < right_shadow) ||
(fb_row >= 0 && loc_right == right_shadow)) {
@@ -1859,7 +1858,7 @@
* The following line, setting hit_stone, is needed for those
* walls that are only 1 wide. If hit stone is *not* set and
* the stone is only one wide, then the close block is the old
- * one instead one on the current row. A way around having to
+ * one instead of one on the current row. A way around having to
* set it here is to make left = loc_right (not loc_right+1) and
* let the outer loop take care of it. However, if we do that
* then we then have to check for boundary conditions here as
@@ -1900,7 +1899,7 @@
* left_side()
*
* This routine is the mirror image of right_side(). Please see right_side()
- * for blow by blow comments.
+ * for blow-by-blow comments.
*/
STATIC_OVL void
left_side(row, cb_row, cb_col, fb_row, fb_col, left_mark, right, limits)
@@ -1917,8 +1916,8 @@
int left_shadow, right_shadow, loc_left;
int lblock_col; /* local block column (current row) */
int nrow, deeper;
- char *row_min; /* left most */
- char *row_max; /* right most */
+ char *row_min; /* leftmost */
+ char *row_max; /* rightmost */
int lim_min;
#ifdef GCC_WARN
@@ -2022,7 +2021,7 @@
set_min(lim_min);
}
}
- return; /* and break out the loop */
+ return; /* and break out of the loop */
}
right = loc_left;
@@ -2079,9 +2078,9 @@
* view_from
*
* Calculate a view from the given location. Initialize and fill a
- * ROWNOxCOLNO array (could_see) with all the locations that could be
- * seen from the source location. Initialize and fill the left most
- * and right most boundaries of what could be seen.
+ * ROWNO x COLNO array (could_see) with all the locations that could
+ * be seen from the source location. Initialize and fill the leftmost
+ * and rightmost boundaries of what could be seen.
*/
STATIC_OVL void
view_from(srow,scol,loc_cs_rows,left_most,right_most, range, func, arg)
@@ -2166,10 +2165,10 @@
#else /*===== End of algorithm D =====*/
-/*===========================================================================*\
- GENERAL LINE OF SIGHT
- Algorithm C
-\*===========================================================================*/
+/*===========================================================================*
+ | GENERAL LINE OF SIGHT |
+ | Algorithm C |
+ *===========================================================================*/
/*
* Defines local to Algorithm C.
@@ -2201,9 +2200,9 @@
int result; /* set by q?_path() */
register int i; /* loop counter */
register char *rowp; /* row optimization */
- char *row_min; /* left most [used by macro set_min()] */
- char *row_max; /* right most [used by macro set_max()] */
- int lim_max; /* right most limit of circle */
+ char *row_min; /* leftmost [used by macro set_min()] */
+ char *row_max; /* rightmost [used by macro set_max()] */
+ int lim_max; /* rightmost limit of circle */
#ifdef GCC_WARN
rowp = row_min = row_max = 0;
@@ -2247,7 +2246,7 @@
* the odds are that we can actually see part of the wall
* beyond the mark on this row. If so, then see one beyond
* the mark. Otherwise don't. This is a kludge so corners
- * with an adjacent doorway show up in nethack.
+ * with an adjacent doorway show up in NetHack.
*/
right_edge = is_clear(row-step,right_mark) ?
right_mark+1 : right_mark;
@@ -2315,7 +2314,7 @@
*
* Otherwise, we know we can see the right edge of the current row.
*
- * This must be a strict less than so that we can always see a
+ * This must be a strict "less than" so that we can always see a
* horizontal wall, even if it is adjacent to us.
*/
if (right_mark < right_edge) {
@@ -2504,8 +2503,8 @@
register int i; /* loop counter */
char *rowp; /* optimization for setting could_see */
int nrow; /* the next row */
- int left; /* the left-most visible column */
- int right; /* the right-most visible column */
+ int left; /* the leftmost visible column */
+ int right; /* the rightmost visible column */
char *limits; /* range limit for next row */
/* Set globals for q?_path(), left_side(), and right_side() to use. */
diff -Ndur nethack-3.4.3/src/weapon.c nethack-patched/src/weapon.c
--- nethack-3.4.3/src/weapon.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/weapon.c 2006-04-25 17:52:32.000000000 +0000
@@ -73,7 +73,7 @@
"escape spells",
"matter spells",
};
-/* indexed vis `is_martial() */
+/* indexed via `is_martial()' */
STATIC_VAR NEARDATA const char * const barehands_or_martial[] = {
"bare handed combat", "martial arts"
};
@@ -133,7 +133,7 @@
if (Is_weapon)
tmp += otmp->spe;
-/* Put weapon specific "to hit" bonuses in below: */
+/* Put weapon-specific "to hit" bonuses in below: */
tmp += objects[otmp->otyp].oc_hitbon;
/* Put weapon vs. monster type "to hit" bonuses in below: */
@@ -167,7 +167,7 @@
}
/* Historical note: The original versions of Hack used a range of damage
- * which was similar to, but not identical to the damage used in Advanced
+ * which was similar to, but not identical to, the damage used in Advanced
* Dungeons and Dragons. I figured that since it was so close, I may as well
* make it exactly the same as AD&D, adding some more weapons in the process.
* This has the advantage that it is at least possible that the player would
@@ -265,7 +265,7 @@
}
if (objects[otyp].oc_material <= LEATHER && thick_skinned(ptr))
- /* thick skinned/scaled creatures don't feel it */
+ /* thick-skinned or scaled creatures don't feel it */
tmp = 0;
if (ptr == &mons[PM_SHADE] && objects[otyp].oc_material != SILVER)
tmp = 0;
@@ -302,10 +302,10 @@
}
if (tmp > 0) {
- /* It's debateable 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
+ /* 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 be _some_ penalty for using damaged gear,
so always subtract erosion even for blunt weapons. */
tmp -= greatest_erosion(otmp);
if (tmp < 1) tmp = 1;
@@ -399,7 +399,7 @@
}
/*
- * other than these two specific cases, always select the
+ * Other than these two specific cases, always select the
* most potent ranged weapon to hand.
*/
for (i = 0; i < SIZE(rwep); i++) {
@@ -482,7 +482,7 @@
};
struct obj *
-select_hwep(mtmp) /* select a hand to hand weapon for the monster */
+select_hwep(mtmp) /* select a hand-to-hand weapon for the monster */
register struct monst *mtmp;
{
register struct obj *otmp;
@@ -556,7 +556,7 @@
}
return;
}
- /* The remaining case where there is a change is where a monster
+ /* The remaining case where there is a change is when a monster
* is polymorphed into a stronger/weaker monster with a different
* choice of weapons. This has no parallel for players. It can
* be handled by waiting until mon_wield_item is actually called.
@@ -699,7 +699,7 @@
else if (str < STR18(100)) sbon = 2;
else sbon = 3;
-/* Game tuning kludge: make it a bit easier for a low level character to hit */
+/* Game tuning kludge: make it a bit easier for a low-level character to hit */
sbon += (u.ulevel < 3) ? 1 : 0;
if (dex < 4) return(sbon-3);
@@ -921,8 +921,8 @@
if (P_RESTRICTED(i)) continue;
/*
- * Sigh, this assumes a monospaced font unless
- * iflags.menu_tab_sep is set in which case it puts
+ * Sigh, this assumes a monospaced font, unless
+ * iflags.menu_tab_sep is set, in which case it puts
* tabs between columns.
* The 12 is the longest skill level name.
* The " " is room for a selection letter and dash, "a - ".
@@ -978,7 +978,7 @@
n = selected[0].item.a_int - 1; /* get item selected */
free((genericptr_t)selected);
skill_advance(n);
- /* check for more skills able to advance, if so then .. */
+ /* check for more skills able to advance; if so, then... */
for (n = i = 0; i < P_NUM_SKILLS; i++) {
if (can_advance(i, speedy)) {
if (!speedy) You_feel("you could be more dangerous!");
@@ -1101,7 +1101,7 @@
static const char bad_skill[] = "weapon_hit_bonus: bad skill %d";
wep_type = weapon_type(weapon);
- /* use two weapon skill only if attacking with one of the wielded weapons */
+ /* use two-weapon skill only if attacking with one of the wielded weapons */
type = (u.twoweap && (weapon == uwep || weapon == uswapwep)) ?
P_TWO_WEAPON_COMBAT : wep_type;
if (type == P_NONE) {
@@ -1169,7 +1169,7 @@
int type, wep_type, skill, bonus = 0;
wep_type = weapon_type(weapon);
- /* use two weapon skill only if attacking with one of the wielded weapons */
+ /* use two-weapon skill only if attacking with one of the wielded weapons */
type = (u.twoweap && (weapon == uwep || weapon == uswapwep)) ?
P_TWO_WEAPON_COMBAT : wep_type;
if (type == P_NONE) {
@@ -1246,7 +1246,7 @@
P_ADVANCE(skill) = 0;
}
- /* Set skill for all weapons in inventory to be basic */
+ /* Set skill for all weapons in inventory to "basic" */
for (obj = invent; obj; obj = obj->nobj) {
skill = weapon_type(obj);
if (skill != P_NONE)
@@ -1273,7 +1273,7 @@
P_SKILL(skill) = P_UNSKILLED;
}
- /* High potential fighters already know how to use their hands. */
+ /* High-potential fighters already know how to use their hands. */
if (P_MAX_SKILL(P_BARE_HANDED_COMBAT) > P_EXPERT)
P_SKILL(P_BARE_HANDED_COMBAT) = P_BASIC;
diff -Ndur nethack-3.4.3/src/wield.c nethack-patched/src/wield.c
--- nethack-3.4.3/src/wield.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/wield.c 2006-04-25 18:02:16.000000000 +0000
@@ -4,7 +4,7 @@
#include "hack.h"
-/* KMH -- Differences between the three weapon slots.
+/* KMH -- Differences among the three weapon slots.
*
* The main weapon (uwep):
* 1. Is filled by the (w)ield command.
@@ -23,7 +23,7 @@
* with the main weapon. If the "pushweapon" option is set,
* the (w)ield command will also store the old weapon in the
* secondary slot.
- * 2. Can be field with anything that will fit in the main weapon
+ * 2. Can be filled with anything that will fit in the main weapon
* slot; that is, any type of item.
* 3. Is usually NOT considered to be carried in the hands.
* That would force too many checks among the main weapon,
@@ -70,7 +70,7 @@
* 1. Initializing the slot during character generation or a
* restore.
* 2. Setting the slot due to a player's actions.
- * 3. If one of the objects in the slot are split off, these
+ * 3. If one of the objects in the slot is split off, these
* functions can be used to put the remainder back in the slot.
* 4. Putting an item that was thrown and returned back into the slot.
* 5. Emptying the slot, by passing a null object. NEVER pass
@@ -86,7 +86,7 @@
{
struct obj *olduwep = uwep;
- if (obj == uwep) return; /* necessary to not set unweapon */
+ if (obj == uwep) return; /* necessary so as not to set unweapon */
/* This message isn't printed in the caller because it happens
* *whenever* Sunsword is unwielded, from whatever cause.
*/
@@ -546,7 +546,7 @@
/*** Functions to empty a given slot ***/
/* These should be used only when the item can't be put back in
- * the slot by life saving. Proper usage includes:
+ * the slot by lifesaving. Proper usage includes:
* 1. The item has been eaten, stolen, burned away, or rotted away.
* 2. Making an item disappear for a bones pile.
*/
@@ -753,8 +753,8 @@
/*
* Enchantment, which normally improves a weapon, has an
- * addition adverse reaction on Magicbane whose effects are
- * spe dependent. Give an obscure clue here.
+ * additional adverse reaction on Magicbane whose effects are
+ * spe-dependent. Give an obscure clue here.
*/
if (uwep->oartifact == ART_MAGICBANE && uwep->spe >= 0) {
Your("right %s %sches!",
diff -Ndur nethack-3.4.3/src/wizard.c nethack-patched/src/wizard.c
--- nethack-3.4.3/src/wizard.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/wizard.c 2006-04-25 18:07:20.000000000 +0000
@@ -324,7 +324,7 @@
}
/* fall through :-) */
- case STRAT_NONE: /* harrass */
+ case STRAT_NONE: /* harass */
if (!rn2(!mtmp->mflee ? 5 : 33)) mnexto(mtmp);
return(0);
@@ -440,7 +440,7 @@
for(j=0; j<20; j++) {
int makeindex;
- /* Don't create more spellcasters of the monsters' level or
+ /* Don't create more spellcasters of the monster's level or
* higher--avoids chain summoners filling up the level.
*/
do {
@@ -468,7 +468,7 @@
return count;
}
-/* Let's resurrect the wizard, for some unexpected fun. */
+/* Let's resurrect the Wizard, for some unexpected fun. */
void
resurrect()
{
@@ -500,7 +500,7 @@
*mmtmp = mtmp->nmon;
mon_arrive(mtmp, TRUE);
/* note: there might be a second Wizard; if so,
- he'll have to wait til the next resurrection */
+ he'll have to wait 'til the next resurrection */
break;
}
}
diff -Ndur nethack-3.4.3/src/worm.c nethack-patched/src/worm.c
--- nethack-3.4.3/src/worm.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/worm.c 2006-04-25 19:07:44.000000000 +0000
@@ -26,7 +26,7 @@
* If wormno == 0 this does not mean that the monster is not a worm,
* it just means that the monster does not have a long worm tail.
*
- * The actual segments of a worm are not full blown monst structs.
+ * The actual segments of a worm are not full-blown monst structs.
* They are small wseg structs, and their position in the levels.monsters[][]
* array is held by the monst struct of the head of the worm. This makes
* things like probing and hit point bookkeeping much easier.
@@ -41,7 +41,7 @@
* wheads: The last (end) of a linked list of segments. This points to
* the segment that is at the same position as the real monster
* (the head). Note that the segment that wheads[wormno] points
- * to, is not displayed. It is simply there to keep track of
+ * to is not displayed. It is simply there to keep track of
* where the head came from, so that worm movement and display are
* simplified later.
* Keeping the head segment of the worm at the end of the list
@@ -104,8 +104,8 @@
* Initialize the worm entry. This will set up the worm grow time, and
* create and initialize the dummy segment for wheads[] and wtails[].
*
- * If the worm has no tail (ie get_wormno() fails) then this function need
- * not be called.
+ * If the worm has no tail (i.e., get_wormno() fails) then this function
+ * need not be called.
*/
void
initworm(worm, wseg_count)
@@ -115,7 +115,7 @@
register struct wseg *seg, *new_tail = create_worm_tail(wseg_count);
register int wnum = worm->wormno;
-/* if (!wnum) return; bullet proofing */
+/* if (!wnum) return; bullet-proofing */
if (new_tail) {
wtails[wnum] = new_tail;
@@ -200,7 +200,7 @@
register int wnum = worm->wormno; /* worm number */
-/* if (!wnum) return; bullet proofing */
+/* if (!wnum) return; bullet-proofing */
/*
* Place a segment at the old worm head. The head has already moved.
@@ -238,7 +238,7 @@
*
* Check for mon->wormno before calling this function!
*
- * The worm don't move so it should shrink.
+ * The worm doesn't move, so it should shrink.
*/
void
worm_nomove(worm)
@@ -265,7 +265,7 @@
{
register int wnum = worm->wormno;
-/* if (!wnum) return; bullet proofing */
+/* if (!wnum) return; bullet-proofing */
worm->wormno = 0;
@@ -291,7 +291,7 @@
register int wnum = worm->wormno;
register struct wseg *seg;
-/* if (!wnum) return; bullet proofing */
+/* if (!wnum) return; bullet-proofing */
/* This does not work right now because mattacku() thinks that the head is
* out of range of the player. We might try to kludge, and bring the head
@@ -322,7 +322,7 @@
int wnum = worm->wormno;
int cut_chance, new_wnum;
- if (!wnum) return; /* bullet proofing */
+ if (!wnum) return; /* bullet-proofing */
if (x == worm->mx && y == worm->my) return; /* hit on head */
@@ -363,7 +363,7 @@
/*
* At this point, the old worm is correct. Any new worm will have
- * it's head at "curr" and its tail at "new_tail".
+ * its head at "curr" and its tail at "new_tail".
*/
/* Sometimes the tail end dies. */
@@ -422,7 +422,7 @@
{
struct wseg *curr = wtails[worm->wormno];
-/* if (!mtmp->wormno) return; bullet proofing */
+/* if (!mtmp->wormno) return; bullet-proofing */
while (curr != wheads[worm->wormno]) {
newsym(curr->wx,curr->wy);
@@ -443,7 +443,7 @@
int num;
struct wseg *curr = wtails[worm->wormno];
-/* if (!mtmp->wormno) return; bullet proofing */
+/* if (!mtmp->wormno) return; bullet-proofing */
while (curr != wheads[worm->wormno]) {
num = use_detection_glyph ?
@@ -546,7 +546,7 @@
{
struct wseg *curr = wtails[worm->wormno];
-/* if (!mtmp->wormno) return; bullet proofing */
+/* if (!mtmp->wormno) return; bullet-proofing */
while (curr != wheads[worm->wormno]) {
place_worm_seg(worm,curr->wx,curr->wy);
@@ -568,7 +568,7 @@
{
register struct wseg *curr = wtails[worm->wormno];
-/* if (!mtmp->wormno) return; bullet proofing */
+/* if (!mtmp->wormno) return; bullet-proofing */
while (curr) {
remove_monster(curr->wx, curr->wy);
@@ -583,7 +583,7 @@
* Place a worm tail somewhere on a level behind the head.
* This routine essentially reverses the order of the wsegs from head
* to tail while placing them.
- * x, and y are most likely the worm->mx, and worm->my, but don't *need* to
+ * x, and y are most likely the worm->mx and worm->my, but don't *need* to
* be, if somehow the head is disjoint from the tail.
*/
void
@@ -596,7 +596,7 @@
struct wseg *new_tail;
register xchar ox = x, oy = y;
-/* if (!wnum) return; bullet proofing */
+/* if (!wnum) return; bullet-proofing */
if (wnum && (!wtails[wnum] || !wheads[wnum]) ) {
impossible("place_worm_tail_randomly: wormno is set without a tail!");
@@ -636,8 +636,8 @@
}
/*
- * Given a coordinate x, y.
- * return in *nx, *ny, the coordinates of one of the <= 8 squares adjoining.
+ * Given a coordinate pair (x, y),
+ * return in (*nx, *ny) the coordinates of one of the <= 8 squares adjoining.
*
* This function, and the loop it serves, could be eliminated by coding
* enexto() with a search radius.
@@ -653,9 +653,9 @@
*nx += (x > 1 ? /* extreme left ? */
(x < COLNO ? /* extreme right ? */
- (rn2(3) - 1) /* neither so +1, 0, or -1 */
- : -rn2(2)) /* 0, or -1 */
- : rn2(2)); /* 0, or 1 */
+ (rn2(3) - 1) /* neither, so +1, 0, or -1 */
+ : -rn2(2)) /* 0 or -1 */
+ : rn2(2)); /* 0 or 1 */
*ny += (*nx == x ? /* same kind of thing with y */
(y > 1 ?
@@ -677,7 +677,6 @@
* returns
* the number of visible segments that a worm has.
*/
-
int
count_wsegs(mtmp)
struct monst *mtmp;
@@ -685,7 +684,7 @@
register int i=0;
register struct wseg *curr = (wtails[mtmp->wormno])->nseg;
-/* if (!mtmp->wormno) return 0; bullet proofing */
+/* if (!mtmp->wormno) return 0; bullet-proofing */
while (curr) {
i++;
diff -Ndur nethack-3.4.3/src/worn.c nethack-patched/src/worn.c
--- nethack-3.4.3/src/worn.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/worn.c 2006-04-25 21:26:58.000000000 +0000
@@ -153,7 +153,7 @@
switch (adjust) {
case 2:
mon->permspeed = MFAST;
- give_msg = FALSE; /* special case monster creation */
+ give_msg = FALSE; /* special-case monster creation */
break;
case 1:
if (mon->permspeed == MSLOW) mon->permspeed = 0;
@@ -502,7 +502,7 @@
mon->misc_worn_check |= flag;
best->owornmask |= flag;
update_mon_intrinsics(mon, best, TRUE, creation);
- /* if couldn't see it but now can, or vice versa, */
+ /* if couldn't see it but now can, or vice versa */
if (!creation && (unseen ^ !canseemon(mon))) {
if (mon->minvis && !See_invisible) {
pline("Suddenly you cannot see %s.", nambuf);
diff -Ndur nethack-3.4.3/src/write.c nethack-patched/src/write.c
--- nethack-3.4.3/src/write.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/write.c 2006-04-25 21:28:06.000000000 +0000
@@ -6,7 +6,7 @@
STATIC_DCL int FDECL(cost,(struct obj *));
/*
- * returns basecost of a scroll or a spellbook
+ * returns base cost of a scroll or a spellbook
*/
STATIC_OVL int
cost(otmp)
@@ -218,7 +218,7 @@
return(1);
}
- /* useup old scroll / spellbook */
+ /* use up old scroll / spellbook */
useup(paper);
/* success */
diff -Ndur nethack-3.4.3/src/zap.c nethack-patched/src/zap.c
--- nethack-3.4.3/src/zap.c 2005-11-18 23:36:58.000000000 +0000
+++ nethack-patched/src/zap.c 2006-04-25 22:16:04.000000000 +0000
@@ -62,7 +62,7 @@
#else
STATIC_VAR const char are_blinded_by_the_flash[] = "are blinded by the flash!";
-const char * const flash_types[] = { /* also used in buzzmu(mcastu.c) */
+const char * const flash_types[] = { /* also used in buzzmu (mcastu.c) */
"magic missile", /* Wands must be 0-9 */
"bolt of fire",
"bolt of cold",
@@ -346,7 +346,7 @@
m_respond(mtmp);
if(mtmp->isshk && !*u.ushops) hot_pursuit(mtmp);
} else if(mtmp->m_ap_type)
- seemimic(mtmp); /* might unblock if mimicing a boulder/door */
+ seemimic(mtmp); /* might unblock if mimicking a boulder/door */
}
/* note: bhitpos won't be set if swallowed, but that's okay since
* reveal_invis will be false. We can't use mtmp->mx, my since it
@@ -1158,7 +1158,7 @@
obj_zapped = TRUE;
if(poly_zapped < 0) {
- /* some may metamorphosize */
+ /* some may metamorphose */
for (i = obj->quan; i; i--)
if (! rn2(Luck + 45)) {
poly_zapped = objects[obj->otyp].oc_material;
@@ -1213,7 +1213,7 @@
if (id == STRANGE_OBJECT) { /* preserve symbol */
int try_limit = 3;
/* Try up to 3 times to make the magic-or-not status of
- the new item be the same as it was for the old one. */
+ the new item the same as it was for the old one. */
otmp = (struct obj *)0;
do {
if (otmp) delobj(otmp);
@@ -1232,7 +1232,7 @@
/* preserve quantity */
otmp->quan = obj->quan;
- /* preserve the shopkeepers (lack of) interest */
+ /* preserve the shopkeeper's (lack of) interest */
otmp->no_charge = obj->no_charge;
/* preserve inventory letter if in inventory */
if (obj_location == OBJ_INVENT)
@@ -1261,11 +1261,11 @@
otmp->corpsenm = NON_PM;
otmp->spe = 0;
- /* now change it into something layed by the hero */
+ /* now change it into something laid by the hero */
while (tryct--) {
mnum = can_be_hatched(random_monster());
if (mnum != NON_PM && !dead_species(mnum, TRUE)) {
- otmp->spe = 1; /* layed by hero */
+ otmp->spe = 1; /* laid by hero */
otmp->corpsenm = mnum;
attach_egg_hatch_timeout(otmp);
break;
@@ -1481,9 +1481,9 @@
}
/*
- * Some parts of this function expect the object to be on the floor
- * obj->{ox,oy} to be valid. The exception to this (so far) is
- * for the STONE_TO_FLESH spell.
+ * Some parts of this function expect the object to be on the floor:
+ * that is, for obj->{ox,oy} to be valid. The exception to this
+ * (so far) is for the STONE_TO_FLESH spell.
*/
if (!(obj->where == OBJ_FLOOR || otmp->otyp == SPE_STONE_TO_FLESH))
impossible("bhito: obj is not floor or Stone To Flesh spell");
@@ -1608,7 +1608,7 @@
res = 0;
break;
}
- /* add more if stone objects are added.. */
+ /* add more if stone objects are added... */
switch (objects[obj->otyp].oc_class) {
case ROCK_CLASS: /* boulders and statues */
if (obj->otyp == BOULDER) {
@@ -1634,7 +1634,7 @@
}
/* Unlikely to get here since genociding
* monsters also sets the G_NOCORPSE flag.
- * Drop the contents, poly_obj looses them.
+ * Drop the contents; poly_obj loses them.
*/
while ((item = obj->cobj) != 0) {
obj_extract_self(item);
@@ -1745,7 +1745,7 @@
/*
* zappable - returns 1 if zap is available, 0 otherwise.
- * it removes a charge from the wand if zappable.
+ * It removes a charge from the wand if zappable.
* added by GAN 11/03/86
*/
int
@@ -2131,7 +2131,7 @@
}
/*
* It is possible that we can now merge some inventory.
- * Do a higly paranoid merge. Restart from the beginning
+ * Do a highly paranoid merge. Restart from the beginning
* until no merges.
*/
do {
@@ -2503,15 +2503,15 @@
#ifdef OVL0
/*
- * Generate the to damage bonus for a spell. Based on the hero's intelligence
+ * Generate the to-damage bonus for a spell. Based on the hero's intelligence
*/
int
spell_damage_bonus()
{
int tmp, intell = ACURR(A_INT);
- /* Punish low intellegence before low level else low intellegence
- gets punished only when high level */
+ /* Punish low intelligence before low level; else low intelligence
+ gets punished only when high-level */
if (intell < 10)
tmp = -3;
else if (u.ulevel < 5)
@@ -2527,7 +2527,7 @@
}
/*
- * Generate the to hit bonus for a spell. Based on the hero's skill in
+ * Generate the to-hit bonus for a spell. Based on the hero's skill in
* spell class and dexterity.
*/
STATIC_OVL int
@@ -2718,11 +2718,11 @@
}
} else {
/* FLASHED_LIGHT hitting invisible monster
- should pass through instead of stop so
+ should pass through instead of stop, so
we call flash_hits_mon() directly rather
than returning mtmp back to caller. That
allows the flash to keep on going. Note
- that we use mtmp->minvis not canspotmon()
+ that we use mtmp->minvis, not canspotmon(),
because it makes no difference whether
the hero can see the monster or not.*/
if (mtmp->minvis) {
@@ -2993,7 +2993,7 @@
m_useup(mon, otmp2);
} else {
/* no body armor, victim dies; destroy cloak
- and shirt now in case target gets life-saved */
+ and shirt now in case target gets lifesaved */
tmp = MAGIC_COOKIE;
if ((otmp2 = which_armor(mon, W_ARMC)) != 0)
m_useup(mon, otmp2);
@@ -3131,7 +3131,7 @@
break;
}
/* no shield or suit, you're dead; wipe out cloak
- and/or shirt in case of life-saving or bones */
+ and/or shirt in case of lifesaving or bones */
if (uarmc) (void) destroy_arm(uarmc);
#ifdef TOURIST
if (uarmu) (void) destroy_arm(uarmu);
@@ -3285,7 +3285,7 @@
struct obj *otmp;
int spell_type;
- /* if its a Hero Spell then get its SPE_TYPE */
+ /* if it's a hero spell then get its SPE_TYPE */
spell_type = is_hero_spell(type) ? SPE_MAGIC_MISSILE + abstype : 0;
fltxt = flash_types[(type <= -30) ? abstype : abs(type)];
@@ -3557,8 +3557,8 @@
spoteffects(TRUE); /* possibly drown, notice objects */
}
-/* Burn floor scrolls, evaporate pools, etc... in a single square. Used
- * both for normal bolts of fire, cold, etc... and for fireballs.
+/* Burn floor scrolls, evaporate pools, etc... in a single square. Used
+ * both for normal bolts of fire, cold, etc., and for fireballs.
* Sets shopdamage to TRUE if a shop door is destroyed, and returns the
* amount by which range is reduced (the latter is just ignored by fireballs)
*/
@@ -3645,7 +3645,7 @@
if (x == u.ux && y == u.uy) {
if (u.uinwater) { /* not just `if (Underwater)' */
- /* leave the no longer existent water */
+ /* leave the no-longer-existent water */
u.uinwater = 0;
u.uundetected = 0;
docrt();
@@ -4115,7 +4115,7 @@
otmp = readobjnam((char *)0, (struct obj *)0, TRUE);
if (!otmp) return; /* for safety; should never happen */
} else if (otmp == ¬hing) {
- /* explicitly wished for "nothing", presumeably attempting
+ /* explicitly wished for "nothing", presumably attempting
to retain wishless conduct */
return;
}