fix typos
This commit is contained in:
@@ -690,7 +690,7 @@ typedef unsigned char uchar;
|
||||
|
||||
/* #define DUMPLOG */ /* End-of-game dump logs */
|
||||
|
||||
#define USE_ISAAC64 /* Use cross-plattform, bundled RNG */
|
||||
#define USE_ISAAC64 /* Use cross-platform, bundled RNG */
|
||||
|
||||
/* TEMPORARY - MAKE UNCONDITIONAL BEFORE RELEASE */
|
||||
/* undef this to check if sandbox breaks something */
|
||||
@@ -716,7 +716,7 @@ typedef unsigned char uchar;
|
||||
#include "global.h" /* Define everything else according to choices above */
|
||||
|
||||
/* Place the following after #include [platform]conf.h in global.h so that
|
||||
overrides are possible in there, for things like unix-specfic file
|
||||
overrides are possible in there, for things like unix-specific file
|
||||
paths. */
|
||||
|
||||
#ifdef LIVELOG
|
||||
|
||||
@@ -747,7 +747,7 @@ struct instance_globals_o {
|
||||
boolean opt_need_promptstyle;
|
||||
|
||||
/* pickup.c */
|
||||
int oldcap; /* last encumberance */
|
||||
int oldcap; /* last encumbrance */
|
||||
|
||||
/* restore.c */
|
||||
struct fruit *oldfruit;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
* 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.
|
||||
*
|
||||
* [3.7] Note: the map doesn't display any monsters when hero is swallowed
|
||||
* (or display non-adjacent, non-submerged ones when hero is underwater),
|
||||
@@ -656,7 +656,7 @@ enum glyph_offsets {
|
||||
(Ugender))
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
||||
@@ -517,7 +517,7 @@ typedef struct color_and_attr {
|
||||
#define LL_DIVINEGIFT 0x0008L /* Sacrifice gifts, crowning */
|
||||
#define LL_LIFESAVE 0x0010L /* Use up amulet of lifesaving */
|
||||
#define LL_CONDUCT 0x0020L /* Break conduct - not reported early-game */
|
||||
#define LL_ARTIFACT 0x0040L /* bestowed, found, or manifactured */
|
||||
#define LL_ARTIFACT 0x0040L /* bestowed, found, or manufactured */
|
||||
#define LL_GENOCIDE 0x0080L /* Logging of genocides */
|
||||
#define LL_KILLEDPET 0x0100L /* Killed a tame monster */
|
||||
#define LL_ALIGNMENT 0x0200L /* changed alignment, temporary or permanent */
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
/* bitmask flags for corpse_xname();
|
||||
PFX_THE takes precedence over ARTICLE, NO_PFX takes precedence over both */
|
||||
#define CXN_NORMAL 0 /* no special handling */
|
||||
#define CXN_SINGULAR 1 /* override quantity if greather than 1 */
|
||||
#define CXN_SINGULAR 1 /* override quantity if greater than 1 */
|
||||
#define CXN_NO_PFX 2 /* suppress "the" from "the Unique Monst */
|
||||
#define CXN_PFX_THE 4 /* prefix with "the " (unless pname) */
|
||||
#define CXN_ARTICLE 8 /* include a/an/the prefix */
|
||||
@@ -682,7 +682,7 @@ enum optset_restrictions {
|
||||
set_viaprog = 2, /* may be set via extern program, not seen in game */
|
||||
set_gameview = 3, /* may be set via extern program, displayed in game */
|
||||
set_in_game = 4, /* may be set via extern program or set in the game */
|
||||
set_wizonly = 5, /* may be set set in the game if wizmode */
|
||||
set_wizonly = 5, /* may be set in the game if wizmode */
|
||||
set_wiznofuz = 6, /* wizard-mode only, but not by fuzzer */
|
||||
set_hidden = 7 /* placeholder for prefixed entries, never show it */
|
||||
};
|
||||
@@ -769,9 +769,9 @@ struct sinfo {
|
||||
int saving; /* creating a save file */
|
||||
int restoring; /* reloading a save file */
|
||||
int in_moveloop; /* normal gameplay in progress */
|
||||
int in_impossible; /* reportig a warning */
|
||||
int in_impossible; /* reporting a warning */
|
||||
int in_docrt; /* in docrt(): redrawing the whole screen */
|
||||
int in_self_recover; /* processsing orphaned level files */
|
||||
int in_self_recover; /* processing orphaned level files */
|
||||
int in_checkpoint; /* saving insurance checkpoint */
|
||||
int in_parseoptions; /* in parseoptions */
|
||||
int in_role_selection; /* role/race/&c selection menus in progress */
|
||||
@@ -786,7 +786,7 @@ struct sinfo {
|
||||
used in the curses interface to avoid arrow keys when user is doing
|
||||
something other than entering a command or direction and in the Qt
|
||||
interface to suppress menu commands in similar conditions;
|
||||
readchar() alrways resets it to 'otherInp' prior to returning */
|
||||
readchar() always resets it to 'otherInp' prior to returning */
|
||||
int input_state; /* whether next key pressed will be entering a command */
|
||||
#ifdef TTY_GRAPHICS
|
||||
/* resize_pending only matters when handling a SIGWINCH signal for tty;
|
||||
@@ -926,7 +926,7 @@ typedef struct {
|
||||
long count; /* holds current line count for default style file,
|
||||
field count for binary style */
|
||||
boolean structlevel; /* traditional structure binary saves */
|
||||
boolean fieldlevel; /* fieldlevel saves saves each field individually */
|
||||
boolean fieldlevel; /* fieldlevel saves each field individually */
|
||||
boolean addinfo; /* if set, some additional context info from core */
|
||||
boolean eof; /* place to mark eof reached */
|
||||
boolean bendian; /* set to true if executing on big-endian machine */
|
||||
@@ -1204,7 +1204,7 @@ typedef uint32_t mmflags_nht; /* makemon MM_ flags */
|
||||
#define ONAME_RANDOM 0x0080U /* something created an artifact randomly
|
||||
* with mk_artifact() (mksboj or mk_player)
|
||||
* or m_initweap() (lawful Angel) */
|
||||
/* flag congrolling potential livelog event of finding an artifact */
|
||||
/* flag controlling potential livelog event of finding an artifact */
|
||||
#define ONAME_KNOW_ARTI 0x0100U /* hero is already aware of this artifact */
|
||||
/* flag for suppressing perm_invent update when name gets assigned */
|
||||
#define ONAME_SKIP_INVUPD 0x0200U /* don't call update_inventory() */
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* integer.h -- provide sized integer types
|
||||
*
|
||||
* We try to sort out a way to provide sized integer types
|
||||
* in here. The strong preference is to try and let a
|
||||
* in here. The strong preference is to try to let a
|
||||
* compiler-supplied header file set up the types.
|
||||
*
|
||||
* If your compiler is C99 conforming and sets a value of
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
#define is_rider(ptr) \
|
||||
((ptr) == &mons[PM_DEATH] || (ptr) == &mons[PM_FAMINE] \
|
||||
|| (ptr) == &mons[PM_PESTILENCE])
|
||||
/* note: placeholder monsters are used for corposes of zombies and mummies;
|
||||
/* note: placeholder monsters are used for corpses of zombies and mummies;
|
||||
PM_DWARF and PM_GNOME are normal monsters, not placeholders */
|
||||
#define is_placeholder(ptr) \
|
||||
((ptr) == &mons[PM_ORC] || (ptr) == &mons[PM_GIANT] \
|
||||
|
||||
@@ -37,10 +37,10 @@
|
||||
* then the value(s) can be plugged in here and monstr.c deleted.
|
||||
* [Note that some monsters might warrant manually calculated
|
||||
* difficulty, on a case by case basis, instead of blindly using
|
||||
* the default value produced by makedefs. Or fix the algoritm
|
||||
* the default value produced by makedefs. Or fix the algorithm
|
||||
* used by makedefs to generate a more appropriate value....]
|
||||
*
|
||||
* TODO: difficulty is closely releated to level; its field ought
|
||||
* TODO: difficulty is closely related to level; its field ought
|
||||
* to be moved sooner in the permonst struct so that it can become
|
||||
* part of LVL() instead of remaining an orphan near the end.
|
||||
*
|
||||
@@ -3276,7 +3276,7 @@
|
||||
M1_SWIM | M1_AMPHIBIOUS | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
|
||||
M2_HOSTILE, 0,
|
||||
4, CLR_BROWN, BABY_CROCODILE),
|
||||
/* trivia: before monster corspes were implemented, "lizard corpse"
|
||||
/* trivia: before monster corpses were implemented, "lizard corpse"
|
||||
was a specific type of item */
|
||||
MON(NAM("lizard"), S_LIZARD,
|
||||
LVL(5, 6, 6, 10, 0), (G_GENO | 5),
|
||||
@@ -3797,7 +3797,7 @@
|
||||
M3_INFRAVISION | M3_INFRAVISIBLE,
|
||||
7, HI_DOMESTIC, HIGH_ELF),
|
||||
#endif
|
||||
/* attendants used to be lawful but have been changed to netural because
|
||||
/* attendants used to be lawful but have been changed to neutral because
|
||||
grow_up() promotes them to healer and the latter is always neutral */
|
||||
MON(NAM("attendant"), S_HUMAN,
|
||||
LVL(5, 12, 10, 10, 0), G_NOGEN,
|
||||
|
||||
@@ -66,7 +66,7 @@ struct objclass {
|
||||
Bitfield(oc_tough, 1); /* hard gems/rings */
|
||||
|
||||
Bitfield(oc_spare1, 6); /* padding to align oc_dir + oc_material;
|
||||
* can be canabalized for other use;
|
||||
* can be cannibalized for other use;
|
||||
* aka 6 free bits */
|
||||
|
||||
Bitfield(oc_dir, 3);
|
||||
|
||||
@@ -1015,7 +1015,7 @@ OBJECT(OBJ("Bell of Opening", "silver bell"),
|
||||
FOOD_CLASS, prob, delay, wt, nutrition / 20 + 5, 0, 0, 0, 0, \
|
||||
nutrition, color, sn)
|
||||
/* 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.
|
||||
* Domestic pets prefer tripe rations above all others.
|
||||
* Fortune cookies can be read, using them up without ingesting them.
|
||||
* Carrots improve your vision.
|
||||
@@ -1037,7 +1037,7 @@ FOOD("meat stick", 0, 1, 1, 0, FLESH, 5, CLR_BROWN,
|
||||
/* formerly "huge chunk of meat" */
|
||||
FOOD("enormous meatball", 0, 20,400, 0, FLESH,2000, CLR_BROWN,
|
||||
ENORMOUS_MEATBALL),
|
||||
/* special case because it's not mergable */
|
||||
/* special case because it's not mergeable */
|
||||
OBJECT(OBJ("meat ring", NoDes),
|
||||
BITS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FLESH),
|
||||
0, FOOD_CLASS, 0, 1, 5, 1, 0, 0, 0, 0, 5, CLR_BROWN, MEAT_RING),
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
* defined to force it back into effect
|
||||
* update_inventory() after leash goes slack
|
||||
* player assigned name for monsters, specific objects, or object types could be
|
||||
longer than what was intented to be allowed; for 'curses', much longer
|
||||
longer than what was intended to be allowed; for 'curses', much longer
|
||||
* windows: added winflexbison to travis-ci configuration to permit full build of
|
||||
* levcomp and dgncomp
|
||||
* windows: a bad chdir specified in win/win32/dgnstuff.mak caused full build to
|
||||
@@ -155,7 +155,7 @@
|
||||
* Fixed stale 'thrownobj' pointer for returning thrown aklys while engulfed
|
||||
* Fixed uarmh null pointer dereference if a helm of opposite alignment came
|
||||
* off due to being polymorphed
|
||||
* Fixed 'object lost' panic when attempting to crawl of of the water during
|
||||
* Fixed 'object lost' panic when attempting to crawl out of the water during
|
||||
* emergency disrobing/dropping
|
||||
* Running now stops when moving over engravings so you can tell where they are
|
||||
* Fixed detection of unseen/secret doors which failed to find monsters hiding
|
||||
|
||||
@@ -269,7 +269,7 @@ struct rm {
|
||||
|
||||
/*
|
||||
* Add wall angle viewing by defining "modes" for each wall type. Each
|
||||
* mode describes which parts of a wall are finished (seen as as wall)
|
||||
* mode describes which parts of a wall are finished (seen as wall)
|
||||
* and which are unfinished (seen as rock).
|
||||
*
|
||||
* We use the bottom 3 bits of the flags field for the mode. This comes
|
||||
@@ -356,7 +356,7 @@ struct rm {
|
||||
#define looted flags /* used for throne, tree, fountain, sink, door */
|
||||
#define icedpool flags /* used for ice (in case it melts) */
|
||||
#define emptygrave flags /* no corpse in grave */
|
||||
/* horizonal applies to walls, doors (including sdoor); also to iron bars
|
||||
/* horizontal applies to walls, doors (including sdoor); also to iron bars
|
||||
even though they don't have separate symbols for horizontal and vertical */
|
||||
#define blessedftn horizontal /* a fountain that grants attribs */
|
||||
#define disturbed horizontal /* kicking or engraving on a grave's headstone
|
||||
|
||||
@@ -82,7 +82,7 @@ enum p_skills {
|
||||
|
||||
/*
|
||||
* These are the standard weapon skill levels. It is important that
|
||||
* the lowest "valid" skill be be 1. The code calculates the
|
||||
* the lowest "valid" skill 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.
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
/* #define DEF_PAGER "/usr/bin/less" */
|
||||
|
||||
/*
|
||||
* Define PORT_HELP to be the name of the port-specfic help file.
|
||||
* Define PORT_HELP to be the name of the port-specific help file.
|
||||
* This file is found in HACKDIR.
|
||||
* Normally, you shouldn't need to change this.
|
||||
* There is currently no port-specific help for Unix systems.
|
||||
|
||||
@@ -94,7 +94,7 @@ typedef struct glyph_map_entry {
|
||||
/* glyph plus additional info
|
||||
if you add fields or change the ordering, fix up the following:
|
||||
g_info initialization in display.c
|
||||
nul_glyphinfo initialization in diplay.c
|
||||
nul_glyphinfo initialization in display.c
|
||||
*/
|
||||
typedef struct gi {
|
||||
int glyph; /* the display entity */
|
||||
|
||||
Reference in New Issue
Block a user