summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-23 21:50:33 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-23 21:50:33 -0500
commitb0ed14492f4344a3c3247fdc206fad74a2973bfe (patch)
tree6521cddd673638b367a3f5f3677c12fca9686bfc
parentb8e97166ca3207b75e437f852679c8c4b8e75b6c (diff)
downloadcrawl-ref-b0ed14492f4344a3c3247fdc206fad74a2973bfe.tar.gz
crawl-ref-b0ed14492f4344a3c3247fdc206fad74a2973bfe.zip
Add spelling fixes.
-rw-r--r--crawl-ref/source/Kills.h2
-rw-r--r--crawl-ref/source/abl-show.cc4
-rw-r--r--crawl-ref/source/acr.cc6
-rw-r--r--crawl-ref/source/art-func.h2
-rw-r--r--crawl-ref/source/artefact.cc2
-rw-r--r--crawl-ref/source/beam.cc12
-rw-r--r--crawl-ref/source/beam.h2
-rw-r--r--crawl-ref/source/clua.cc2
-rw-r--r--crawl-ref/source/command.cc2
-rw-r--r--crawl-ref/source/database.cc4
-rw-r--r--crawl-ref/source/delay.cc2
-rw-r--r--crawl-ref/source/describe.cc2
-rw-r--r--crawl-ref/source/directn.cc4
-rw-r--r--crawl-ref/source/dungeon.cc4
-rw-r--r--crawl-ref/source/effects.cc6
-rw-r--r--crawl-ref/source/ghost.cc4
-rw-r--r--crawl-ref/source/hiscores.cc2
-rw-r--r--crawl-ref/source/initfile.cc4
-rw-r--r--crawl-ref/source/item_use.cc4
-rw-r--r--crawl-ref/source/libunix.cc2
-rw-r--r--crawl-ref/source/macro.cc6
-rw-r--r--crawl-ref/source/menu.h2
-rw-r--r--crawl-ref/source/misc.cc12
-rw-r--r--crawl-ref/source/mon-util.cc16
-rw-r--r--crawl-ref/source/monspeak.cc2
-rw-r--r--crawl-ref/source/monstuff.cc2
-rw-r--r--crawl-ref/source/mstuff2.cc4
-rw-r--r--crawl-ref/source/newgame.cc4
-rw-r--r--crawl-ref/source/output.cc2
-rw-r--r--crawl-ref/source/place.cc2
-rw-r--r--crawl-ref/source/religion.cc2
-rw-r--r--crawl-ref/source/shopping.cc2
-rw-r--r--crawl-ref/source/spells1.cc8
-rw-r--r--crawl-ref/source/spl-mis.cc14
-rw-r--r--crawl-ref/source/stuff.cc4
-rw-r--r--crawl-ref/source/tags.cc7
-rw-r--r--crawl-ref/source/tilefont.cc2
-rw-r--r--crawl-ref/source/tilepick.cc8
-rw-r--r--crawl-ref/source/tilereg.cc6
-rw-r--r--crawl-ref/source/tiles.h2
-rw-r--r--crawl-ref/source/transfor.cc2
-rw-r--r--crawl-ref/source/travel.cc2
-rw-r--r--crawl-ref/source/view.cc9
-rw-r--r--crawl-ref/source/xom.cc4
44 files changed, 99 insertions, 97 deletions
diff --git a/crawl-ref/source/Kills.h b/crawl-ref/source/Kills.h
index cff0c3525a..4f737ed22e 100644
--- a/crawl-ref/source/Kills.h
+++ b/crawl-ref/source/Kills.h
@@ -58,7 +58,7 @@ public:
kill_def(const monsters *mon);
kill_def() : kills(0), exp(0)
{
- // This object just says to the world that it's uninitialized
+ // This object just says to the world that it's uninitialised
}
void save(writer&) const;
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 84ee18ceb2..95dbc29ccd 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -425,7 +425,7 @@ const std::string make_cost_description(ability_type ability)
if (!ret.str().empty())
ret << ", ";
- ret << "Food"; // randomized and amount hidden from player
+ ret << "Food"; // randomised and amount hidden from player
}
if (abil.piety_cost)
@@ -433,7 +433,7 @@ const std::string make_cost_description(ability_type ability)
if (!ret.str().empty())
ret << ", ";
- ret << "Piety"; // randomized and amount hidden from player
+ ret << "Piety"; // randomised and amount hidden from player
}
if (abil.flags & ABFLAG_BREATH)
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 6156469b73..2da1b34de9 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1688,7 +1688,7 @@ void process_command( command_type cmd )
mpr("Move the cursor around to observe a square "
"(v - describe square, ? - help)", MSGCH_PROMPT);
- struct dist lmove; // Will be initialized by direction().
+ struct dist lmove; // Will be initialised by direction().
direction(lmove, DIR_TARGET, TARG_ANY, -1, true);
if (lmove.isValid && lmove.isTarget && !lmove.isCancel
&& !crawl_state.arena_suspended)
@@ -2016,7 +2016,7 @@ static void _prep_input()
// Decrement a single duration. Print the message if the duration runs out.
// At midpoint (defined by get_expiration_threshold() in player.cc)
-// print midmsg and decrease duration by midloss (a randomized amount so as
+// print midmsg and decrease duration by midloss (a randomised amount so as
// to make it impossible to know the exact remaining duration for sure).
// NOTE: The maximum possible midloss should be smaller than midpoint,
// otherwise the duration may end in the same turn the warning
@@ -3632,7 +3632,7 @@ static bool _initialise(void)
#ifdef USE_TILE
tiles.initialise_items();
- // Must re-run as the feature table wasn't initialized yet.
+ // Must re-run as the feature table wasn't initialised yet.
TileNewLevel(newc);
#endif
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index bcc19c9851..0622259751 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -10,7 +10,7 @@
* util/art-data.pl scans through this file to grab the functions
* non-standard unrandarts use and put them into the unranddata structs
* in art-data.h, so the function names must have the form of
- * _UNRAND_ENUM_func_name() in order to be recognized.
+ * _UNRAND_ENUM_func_name() in order to be recognised.
*/
#ifdef ART_FUNC_H
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index a1deb2c363..5c8a1dafc0 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -1973,7 +1973,7 @@ bool make_item_randart( item_def &item )
do
{
item.special = (random_int() & RANDART_SEED_MASK);
- // Now that we found something, initialize the props array.
+ // Now that we found something, initialise the props array.
if (!_init_artefact_properties(item))
{
// Something went wrong that no amount of changing
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 855060f95c..c22ba8ad09 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -199,7 +199,7 @@ bool zapping(zap_type ztype, int power, bolt &pbolt,
pbolt.thrower = KILL_YOU_MISSILE;
// Check whether tracer goes through friendlies.
- // NOTE: Whenever zapping() is called with a randomized value for power
+ // NOTE: Whenever zapping() is called with a randomised value for power
// (or effect), player_tracer should be called directly with the highest
// power possible respecting current skill, experience level, etc.
if (needs_tracer && !player_tracer(ztype, power, pbolt))
@@ -1450,7 +1450,7 @@ bool bolt::invisible() const
return (type == 0 || is_enchantment());
}
-void bolt::initialize_fire()
+void bolt::initialise_fire()
{
// Fix some things which the tracer might have set.
range_used = 0;
@@ -2015,7 +2015,7 @@ void bolt::fire()
void bolt::do_fire()
{
- initialize_fire();
+ initialise_fire();
if (range <= range_used && range > 0)
{
@@ -2133,7 +2133,7 @@ void bolt::do_fire()
// enchantment is yours (and it wasn't a chaos beam, since with chaos
// enchantments are entirely random, and if it randomly attempts
// something which ends up having no obvious effect then the player
- // isn't going to realize it).
+ // isn't going to realise it).
if (!msg_generated && !obvious_effect && is_enchantment()
&& real_flavour != BEAM_CHAOS && YOU_KILL(thrower))
{
@@ -4613,7 +4613,7 @@ void bolt::affect_monster(monsters* mon)
// Player beams which hit friendlies or good neutrals will annoy
// them and be considered naughty if they do damage (this is so as
- // not to penalize players that fling fireballs into a melee with
+ // not to penalise players that fling fireballs into a melee with
// fire elementals on their side - the elementals won't give a sh*t,
// after all).
@@ -5759,7 +5759,7 @@ bool bolt::nice_to(const monsters *mon) const
// A constructor for bolt to help guarantee that we start clean (this has
// caused way too many bugs). Putting it here since there's no good place to
-// put it, and it doesn't do anything other than initialize its members.
+// put it, and it doesn't do anything other than initialise its members.
//
// TODO: Eventually it'd be nice to have a proper factory for these things
// (extended from setup_mons_cast() and zapping() which act as limited ones).
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h
index 12ea00041c..9fa3c21f6c 100644
--- a/crawl-ref/source/beam.h
+++ b/crawl-ref/source/beam.h
@@ -243,7 +243,7 @@ public:
void monster_post_hit(monsters* mon, int dmg);
bool misses_player();
- void initialize_fire();
+ void initialise_fire();
void apply_beam_conducts();
void choose_ray();
void draw(const coord_def& p);
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 5e4a6965dd..d14df76573 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -195,7 +195,7 @@ void CLua::set_error(int err, lua_State *ls)
}
if (!ls && !(ls = _state))
{
- error = "<LUA not initialized>";
+ error = "<LUA not initialised>";
return;
}
const char *serr = lua_tostring(ls, -1);
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 6aae22dedf..7380faa190 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -2112,7 +2112,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
true, true, _cmdhelp_textfilter);
unsigned ch;
- // Initialize colour to quiet some Valgrind warnings
+ // Initialise colour to quiet some Valgrind warnings.
unsigned short colour = BLACK;
std::string item_types =
"\n"
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index a3c2346e7f..0f0399e7cb 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -477,7 +477,7 @@ static std::string _getWeightedString(DBM *database, const std::string &key,
const std::string &suffix,
int fixed_weight = -1)
{
- // We have to canonicalize the key (in case the user typed it
+ // We have to canonicalise the key (in case the user typed it
// in and got the case wrong.)
std::string canonical_key = key + suffix;
lowercase(canonical_key);
@@ -599,7 +599,7 @@ static std::string _query_database(DBM *db, std::string key,
{
if (canonicalise_key)
{
- // We have to canonicalize the key (in case the user typed it
+ // We have to canonicalise the key (in case the user typed it
// in and got the case wrong.)
lowercase(key);
}
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index c8a73876fb..7ebb5a8b82 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -1739,7 +1739,7 @@ void run_macro(const char *macroname)
#ifdef CLUA_BINDINGS
if (!clua)
{
- mpr("Lua not initialized", MSGCH_DIAGNOSTICS);
+ mpr("Lua not initialised", MSGCH_DIAGNOSTICS);
stop_delay();
return;
}
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 4da797fa67..4ac11ea4e9 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3273,7 +3273,7 @@ const char *divine_title[NUM_GODS][8] =
// Feawn -- nature theme, titles could use some work but the progression
// is generally from nature lover to walking disaster. -CAO
- {"Walking Fertilizer", "Green %s", "Tree Hugger", "Conservationist",
+ {"Walking Fertiliser", "Green %s", "Tree Hugger", "Conservationist",
"Floral Guardian", "Eco-Terrorist", "Green Death", "Force of Nature"}
};
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 301ac61143..328896c011 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1434,7 +1434,7 @@ void direction(dist& moves, targeting_type restricts,
allow_out_of_range = true;
}
// intentional fall-through
- case CMD_TARGET_SELECT: // finalize current choice
+ case CMD_TARGET_SELECT: // finalise current choice
if (!moves.isEndpoint)
{
const monsters* m = monster_at(moves.target);
@@ -1666,7 +1666,7 @@ void direction(dist& moves, targeting_type restricts,
if (_dist_ok(moves, allow_out_of_range ? -1 : range,
mode, may_target_self, cancel_at_self))
{
- // Finalize whatever is inside the loop
+ // Finalise whatever is inside the loop
// (moves-internal finalizations can be done later).
moves.choseRay = show_beam;
moves.ray = ray;
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 5d8842a95e..f693fc6125 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -926,7 +926,7 @@ void dgn_reset_level()
for (int i = 0; i < MAX_TRAPS; i++)
env.trap[i].type = TRAP_UNASSIGNED;
- // Initialize all items.
+ // Initialise all items.
for (int i = 0; i < MAX_ITEMS; i++)
init_item( i );
@@ -1787,7 +1787,7 @@ static void _hide_doors()
}
}
-// Places a randomized ellipse with centre (x,y) and half axes a and b.
+// Places a randomised ellipse with centre (x, y) and half axes a and b.
static void _place_ellipse(int x, int y, int a, int b,
dungeon_feature_type feat, int margin)
{
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index f8d9ba6a3f..31cdaa814b 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -591,7 +591,7 @@ bool forget_spell(void)
bool lose_stat(unsigned char which_stat, unsigned char stat_loss, bool force,
const char *cause, bool see_source)
{
- bool statLowered = false; // must initialize to false {dlb}
+ bool statLowered = false; // must initialise to false {dlb}
char *ptr_stat = NULL;
bool *ptr_redraw = NULL;
char newValue = 0; // holds new value, for comparison to old {dlb}
@@ -2286,7 +2286,7 @@ bool recharge_wand(int item_slot)
charged ? "glows" : "flickers",
desc.c_str());
- // Reinitialize zap counts.
+ // Reinitialise zap counts.
wand.plus = new_charges;
wand.plus2 = (charged ? ZAPCOUNT_RECHARGED : ZAPCOUNT_MAX_CHARGED);
}
@@ -3628,7 +3628,7 @@ void handle_time(long time_delta)
added_contamination--;
// Only punish if contamination caused by mutagenic randarts.
- // (Haste and invisibility already penalized earlier.)
+ // (Haste and invisibility already penalised earlier.)
contaminate_player( added_contamination, mutagenic_randart );
// Only check for badness once every other turn.
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index fd24a3d77f..81bab51106 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -859,8 +859,8 @@ bool debug_check_ghosts()
for (unsigned int k = 0; k < ghosts.size(); ++k)
{
ghost_demon ghost = ghosts[k];
- // Values greater than the allowed maximum or less then the allowed
- // minimum signalize bugginess.
+ // Values greater than the allowed maximum or less then the
+ // allowed minimum signalise bugginess.
if (ghost.damage < 0 || ghost.damage > MAX_GHOST_DAMAGE)
return (false);
if (ghost.max_hp < 1 || ghost.max_hp > MAX_GHOST_HP)
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index baf1756296..2b1a02db14 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -470,7 +470,7 @@ scorefile_entry::scorefile_entry(int dam, int dsource, int dtype,
scorefile_entry::scorefile_entry()
{
- // Completely uninitialized, caveat user.
+ // Completely uninitialised, caveat user.
reset();
}
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 5cd896cce6..a342137e3b 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2521,7 +2521,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
}
else if (key == "wiz_mode")
{
- // wiz_mode is recognized as a legal key in all compiles -- bwr
+ // wiz_mode is recognised as a legal key in all compiles -- bwr
#ifdef WIZARD
if (field == "never")
wiz_mode = WIZ_NEVER;
@@ -3490,7 +3490,7 @@ bool parse_args( int argc, char **argv, bool rc_only )
bool nextUsed = false;
int ecount;
- // initialize
+ // initialise
for (int i = 0; i < num_cmd_ops; i++)
arg_seen[i] = false;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 88794020cf..5b47066e01 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2365,7 +2365,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
if (is_blood_potion(item) && thrown.quantity > 1)
{
- // Initialize thrown potion with oldest potion in stack.
+ // Initialise thrown potion with oldest potion in stack.
long val = remove_oldest_blood_potion(thrown);
val -= you.num_turns;
item.props.clear();
@@ -2870,7 +2870,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
}
}
- // FINALIZE tohit and damage
+ // FINALISE tohit and damage
if (exHitBonus >= 0)
pbolt.hit = baseHit + random2avg(exHitBonus + 1, 2);
else
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index d2ac1c157a..57c2791591 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -462,7 +462,7 @@ void message_out(int which_line, int color, const char *s, int firstcol,
static void unixcurses_defkeys( void )
{
#ifdef NCURSES_VERSION
- // keypad 0-9 (only if the "application mode" was successfully initialized)
+ // keypad 0-9 (only if the "application mode" was successfully initialised)
define_key("\033Op", 1000);
define_key("\033Oq", 1001);
define_key("\033Or", 1002);
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index d6b998cc83..4614a0b712 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -346,7 +346,7 @@ static keyseq parse_keyseq( std::string s )
}
/*
- * Serializes a key sequence into a string of the format described
+ * Serialises a key sequence into a string of the format described
* above.
*/
static std::string vtostr( const keyseq &seq )
@@ -465,7 +465,7 @@ static void macro_buf_add_long( keyseq actions,
// The matching starts from as early as possible, and is
// as long as possible given the first constraint. I.e from
// the sequence "abcdef" and macros "ab", "bcde" and "de"
- // "ab" and "de" are recognized as macros.
+ // "ab" and "de" are recognised as macros.
while (actions.size() > 0)
{
@@ -847,7 +847,7 @@ void macro_add_query( void )
}
/*
- * Initializes the macros.
+ * Initialises the macros.
*/
static void _read_macros_from(const char* filename)
{
diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h
index b2cc572c30..0d6c3f1a52 100644
--- a/crawl-ref/source/menu.h
+++ b/crawl-ref/source/menu.h
@@ -275,7 +275,7 @@ public:
Menu(int flags = MF_MULTISELECT, const std::string& tagname = "",
bool text_only = true);
- // Initializes a Menu from a formatted_string as follows:
+ // Initialises a Menu from a formatted_string as follows:
//
// 1) Splits the formatted_string on EOL (this is not necessarily \n).
// 2) Picks the most recently used non-whitespace colour as the colour
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index eb886c63d5..2bec5b9aff 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -188,7 +188,7 @@ void turn_corpse_into_skeleton_and_chunks(item_def &item)
}
}
-// Initialize blood potions with a vector of timers.
+// Initialise blood potions with a vector of timers.
void init_stack_blood_potions(item_def &stack, int age)
{
ASSERT(is_blood_potion(stack));
@@ -917,7 +917,7 @@ void turn_corpse_into_blood_potions(item_def &item)
item.quantity = num_blood_potions_from_corpse(mons_class);
- // Initialize timer depending on corpse age:
+ // Initialise timer depending on corpse age:
// almost rotting: age = 100 --> potion timer = 500 --> will coagulate soon
// freshly killed: age = 200 --> potion timer = 2500 --> fresh !blood
init_stack_blood_potions(item, (item.special - 100) * 20 + 500);
@@ -1164,7 +1164,7 @@ void generate_random_blood_spatter_on_level()
{
int startprob;
- // startprob is used to initialize the chance for neighbours being
+ // startprob is used to initialise the chance for neighbours being
// spattered, which will be decreased by 1 per recursion round.
// We then use one_chance_in(chance) to determine whether to spatter a
// given grid or not. Thus, startprob = 1 means that initially all
@@ -1508,8 +1508,8 @@ static int runes_in_pack(std::vector<int> &runes)
bool check_annotation_exclusion_warning()
{
- // Players might not realize the implications of teleport
- // mutations in the labyrinth.
+ // Players might not realise the implications of teleport mutations
+ // in the labyrinth.
if (grd(you.pos()) == DNGN_ENTER_LABYRINTH
&& player_mutation_level(MUT_TELEPORT))
{
@@ -2798,7 +2798,7 @@ void remove_auto_exclude(const monsters *mon, bool sleepy)
}
// Return all nearby monsters in range (default: LOS) that the player
-// is able to recognize as being monsters (i.e. no unknown mimics or
+// is able to recognise as being monsters (i.e. no unknown mimics or
// submerged creatures.)
//
// want_move (??) Somehow affects what monsters are considered dangerous
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 28455a09f1..9d2ce0610d 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -68,7 +68,7 @@ struct mon_spellbook
mon_display monster_symbols[NUM_MONSTERS];
-static bool initialized_randmons = false;
+static bool initialised_randmons = false;
static std::vector<monster_type> monsters_by_habitat[NUM_HABITATS];
#include "mon-data.h"
@@ -124,7 +124,7 @@ dungeon_feature_type habitat2grid(habitat_type ht)
}
}
-static void _initialize_randmons()
+static void _initialise_randmons()
{
for (int i = 0; i < NUM_HABITATS; ++i)
{
@@ -139,7 +139,7 @@ static void _initialize_randmons()
monsters_by_habitat[i].push_back(static_cast<monster_type>(m));
}
}
- initialized_randmons = true;
+ initialised_randmons = true;
}
monster_type random_monster_at_grid(const coord_def& p)
@@ -149,8 +149,8 @@ monster_type random_monster_at_grid(const coord_def& p)
monster_type random_monster_at_grid(dungeon_feature_type grid)
{
- if (!initialized_randmons)
- _initialize_randmons();
+ if (!initialised_randmons)
+ _initialise_randmons();
const habitat_type ht = grid2habitat(grid);
const std::vector<monster_type> &valid_mons = monsters_by_habitat[ht];
@@ -533,7 +533,7 @@ bool mons_behaviour_perceptible(const monsters *mon)
// Returns true for monsters that obviously (to the player) feel
// "thematically at home" in a branch. Currently used for native
-// monsters recognizing traps and patrolling branch entrances.
+// monsters recognising traps and patrolling branch entrances.
bool mons_is_native_in_branch(const monsters *monster,
const branch_type branch)
{
@@ -3165,7 +3165,7 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell )
}
// We'll estimate the target's resistance to magic, by first getting
- // the actual value and then randomizing it.
+ // the actual value and then randomising it.
int est_magic_resist = (mon->foe == MHITNOT) ? 10000 : 0;
if (mon->foe != MHITNOT)
@@ -3175,7 +3175,7 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell )
else
est_magic_resist = mons_resist_magic(&menv[mon->foe]);
- // now randomize (normal intels less accurate than high):
+ // now randomise (normal intels less accurate than high):
if (intel == I_NORMAL)
est_magic_resist += random2(80) - 40;
else
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc
index 9420156c25..a62aa2e167 100644
--- a/crawl-ref/source/monspeak.cc
+++ b/crawl-ref/source/monspeak.cc
@@ -383,7 +383,7 @@ bool mons_speaks(monsters *monster)
if (!force_speak)
{
// Invisible monster tries to remain unnoticed. Unless they're
- // confused, since then they're too confused to realize they
+ // confused, since then they're too confused to realise they
// should stay silent, but only if the player can see them, so as
// to not have to deal with cases of speaking monsters which the
// player can't see.
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index afbb3f0fbf..ce318957df 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -9074,7 +9074,7 @@ static bool _monster_move(monsters *monster)
} // endif - secret/closed doors
// Monsters that eat items (currently only jellies) also eat doors.
- // However, they don't realize that secret doors make good eating.
+ // However, they don't realise that secret doors make good eating.
if ((grd(newpos) == DNGN_CLOSED_DOOR || grd(newpos) == DNGN_OPEN_DOOR)
&& mons_itemeat(monster) == MONEAT_ITEMS
// Doors with permarock marker cannot be eaten.
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 7299ba365c..15bd46a7f3 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1260,7 +1260,7 @@ void monster_teleport(monsters *monster, bool instan, bool silent)
monster->type = MONS_GOLD_MIMIC + random2(5);
monster->colour = get_mimic_colour( monster );
- // If it's changed form, you won't recognize it.
+ // If it's changed form, you won't recognise it.
// This assumes that a non-gold mimic turning into another item of
// the same description is really, really unlikely.
if (old_type != MONS_GOLD_MIMIC || monster->type != MONS_GOLD_MIMIC)
@@ -1751,7 +1751,7 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
bolt beam;
- // Initialize to some bogus values so we can catch problems.
+ // Initialise to some bogus values so we can catch problems.
beam.name = "****";
beam.colour = 1000;
beam.hit = -1;
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index ef1047a5ad..e65a8a3ddf 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1314,7 +1314,7 @@ game_start:
// Needs to be done before handing out food.
give_basic_mutations(you.species);
- // This function depends on stats and mutations being finalized.
+ // This function depends on stats and mutations being finalised.
// Returns false if Backspace on god/weapon/... selection.
if (!_give_items_skills())
{
@@ -1386,7 +1386,7 @@ game_start:
origin_set_inventory(origin_set_startequip);
// We calculate hp and mp here; all relevant factors should be
- // finalized by now. (GDL)
+ // finalised by now. (GDL)
calc_hp();
calc_mp();
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 7229de194c..36827ad37f 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -73,7 +73,7 @@ class colour_bar
m_old_disp(-1),
m_request_redraw_after(0)
{
- // m_old_disp < 0 means it's invalid and needs to be initialized.
+ // m_old_disp < 0 means it's invalid and needs to be initialised.
}
bool wants_redraw() const
diff --git a/crawl-ref/source/place.cc b/crawl-ref/source/place.cc
index c035e3f96e..bef094dd7f 100644
--- a/crawl-ref/source/place.cc
+++ b/crawl-ref/source/place.cc
@@ -113,7 +113,7 @@ std::string place_name( unsigned short place, bool long_name,
char buf[200];
if (long_name)
{
- // decapitalize 'the'
+ // decapitalise 'the'
if ( result.find("The") == 0 )
result[0] = 't';
snprintf( buf, sizeof buf, "Level %d of %s",
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 66fdae17a2..71fbcb5048 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -6523,7 +6523,7 @@ bool feawn_protects(const monsters * target)
return target && feawn_protects_species(target->mons_species());
}
-// Feawn neutralizes most plants and fungi but skips toadstools to prevent
+// Feawn neutralises most plants and fungi but skips toadstools to prevent
// message spam (and killing them doesn't even cause piety loss).
bool feawn_neutralises(const monsters * target)
{
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 51dccf3f4f..39342eedaf 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -358,7 +358,7 @@ static bool _in_a_shop( int shopidx )
{
if (!check_item_knowledge(true))
{
- _shop_print("You don't recognize anything yet!", 1);
+ _shop_print("You don't recognise anything yet!", 1);
_shop_more();
}
}
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 0bcc604378..95a9df1302 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -297,7 +297,7 @@ void cast_chain_lightning(int pow)
{
bolt beam;
- // initialize beam structure
+ // initialise beam structure
beam.name = "lightning arc";
beam.aux_source = "chain lightning";
beam.beam_source = MHITYOU;
@@ -316,7 +316,7 @@ void cast_chain_lightning(int pow)
for (source = you.pos(); pow > 0; pow -= 8 + random2(13), source = target)
{
// infinity as far as this spell is concerned
- // (Range - 1) is used because the distance is randomized and
+ // (Range - 1) is used because the distance is randomised and
// may be shifted by one.
int min_dist = MONSTER_LOS_RANGE - 1;
@@ -339,7 +339,7 @@ void cast_chain_lightning(int pow)
if (!dist)
continue;
- // randomize distance (arcs don't care about a couple of feet)
+ // randomise distance (arcs don't care about a couple of feet)
dist += (random2(3) - 1);
// always ignore targets further than current one
@@ -376,7 +376,7 @@ void cast_chain_lightning(int pow)
if (dist) // i.e., player was not the source
{
- // distance randomized (as above)
+ // distance randomised (as above)
dist += (random2(3) - 1);
// select player if only, closest, or randomly selected
diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index b547edc719..22350bb495 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -2327,11 +2327,11 @@ void MiscastEffect::_earth(int severity)
break;
case 9:
{
- bool pluralized = true;
- std::string feet = you.foot_name(true, &pluralized);
+ bool pluralised = true;
+ std::string feet = you.foot_name(true, &pluralised);
std::ostringstream str;
- str << "Your " << feet << (pluralized ? " feel" : " feels")
+ str << "Your " << feet << (pluralised ? " feel" : " feels")
<< " warm.";
you_msg = str.str();
@@ -2448,13 +2448,13 @@ void MiscastEffect::_air(int severity)
break;
case 5:
{
- bool pluralized = true;
+ bool pluralised = true;
if (!hand_str.empty())
- pluralized = can_plural_hand;
+ pluralised = can_plural_hand;
else
- target->hand_name(true, &pluralized);
+ target->hand_name(true, &pluralised);
- if (pluralized)
+ if (pluralised)
{
you_msg = "Sparks of electricity dance between your "
"@hands@.";
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 1836db3c75..e405c2bf73 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -671,7 +671,7 @@ int roll_dice(int num, int size)
return (ret);
}
-// originally designed to randomize evasion -
+// originally designed to randomise evasion -
// values are slightly lowered near (max) and
// approach an upper limit somewhere near (limit/2)
int random2limit(int max, int limit)
@@ -843,7 +843,7 @@ void redraw_screen(void)
}
// STEPDOWN FUNCTION to replace conditional chains in spells2.cc 12jan2000 {dlb}
-// it is a bit more extensible and optimizes the logical structure, as well
+// it is a bit more extensible and optimises the logical structure, as well
// usage: cast_summon_swarm() cast_summon_wraiths() cast_summon_scorpions()
// cast_summon_horrible_things()
// ex(1): stepdown_value (foo, 2, 2, 6, 8) replaces the following block:
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index c60de53eec..4f2e0214f3 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -746,11 +746,12 @@ tag_type tag_read(FILE *fp, char minorVersion)
// Older savefiles might want to call this to get a tag properly
-// initialized if it wasn't part of the savefile.
-// For now, none are supported.
+// initialised if it wasn't part of the savefile. For now, none are
+// supported.
// This function will be called AFTER all other tags for the savefile
-// are read, so everything that can be initialized should have been by now.
+// are read, so everything that can be initialised should have been by
+// now.
// minorVersion is available for any child functions that need it
// (currently none).
diff --git a/crawl-ref/source/tilefont.cc b/crawl-ref/source/tilefont.cc
index be531595ee..6ecabf4f20 100644
--- a/crawl-ref/source/tilefont.cc
+++ b/crawl-ref/source/tilefont.cc
@@ -59,7 +59,7 @@ bool FTFont::load_font(const char *font_name, unsigned int font_size, bool outl)
error = FT_Init_FreeType(&library);
if (error)
{
- fprintf(stderr, "Failed to initialize freetype library.\n");
+ fprintf(stderr, "Failed to initialise freetype library.\n");
return false;
}
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ff0f574ebd..b7971cfd64 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2959,7 +2959,7 @@ int tileidx_spell(spell_type spell)
}
// Modify wall tile index depending on floor/wall flavour.
-static inline void _finalize_tile(unsigned int *tile,
+static inline void _finalise_tile(unsigned int *tile,
unsigned char wall_flv,
unsigned char floor_flv,
unsigned char special_flv,
@@ -4415,7 +4415,7 @@ void tile_floor_halo(dungeon_feature_type target, int tile)
}
else if (u_spc && d_spc)
{
- // We know this value is already initialized and
+ // We know this value is already initialised and
// is necessarily in bounds.
int t = env.tile_flv[x][y-1].floor - tile;
if (t == SPECIAL_NE || t == SPECIAL_E)
@@ -4427,7 +4427,7 @@ void tile_floor_halo(dungeon_feature_type target, int tile)
}
else if (r_spc && l_spc)
{
- // We know this value is already initialized and
+ // We know this value is already initialised and
// is necessarily in bounds.
int t = env.tile_flv[x-1][y].floor - tile;
if (t == SPECIAL_NW || t == SPECIAL_N)
@@ -4748,7 +4748,7 @@ void tile_finish_dngn(unsigned int *tileb, int cx, int cy)
special_flv = env.tile_flv(gc).special;
}
- _finalize_tile(&tileb[count+1], wall_flv, floor_flv, special_flv,
+ _finalise_tile(&tileb[count+1], wall_flv, floor_flv, special_flv,
gc);
if (is_excluded(gc))
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index a3b43a539d..5d8099d635 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -3791,7 +3791,7 @@ void DollEditRegion::render()
m_font_buf.add("Change parts left/right Confirm choice Enter", VColour::white, 0.0f, start_y);
m_font_buf.add("Change category up/down Copy doll Ctrl-C", VColour::white, 0.0f, start_y + height * 1);
m_font_buf.add("Change doll 0-9, Shift + arrows Paste copied doll Ctrl-V", VColour::white, 0.0f, start_y + height * 2);
- m_font_buf.add("Change doll mode m Randomize doll Ctrl-R", VColour::white, 0.0f, start_y + height * 3);
+ m_font_buf.add("Change doll mode m Randomise doll Ctrl-R", VColour::white, 0.0f, start_y + height * 3);
m_font_buf.add("Quit menu q, Escape, Ctrl-S Toggle equipment *", VColour::white, 0.0f, start_y + height * 4);
}
@@ -3805,12 +3805,12 @@ int DollEditRegion::handle_mouse(MouseEvent &event)
void DollEditRegion::run()
{
- // Initialize equipment setting.
+ // Initialise equipment setting.
dolls_data equip_doll;
for (unsigned int i = 0; i < TILEP_PART_MAX; ++i)
equip_doll.parts[i] = TILEP_SHOW_EQUIP;
- // Initialize job default.
+ // Initialise job default.
m_job_default = equip_doll;
tilep_race_default(you.species, gender,
you.experience_level, m_job_default.parts);
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 9d2929ee16..725ba5b84f 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -97,7 +97,7 @@ void tile_init_default_flavour();
void tile_default_flv(level_area_type lev, branch_type br, tile_flavour &flv);
// Clear the per-cell wall and floor flavors.
void tile_clear_flavour();
-// Initialize per-cell types of walls and floors using defaults.
+// Initialise per-cell types of walls and floors using defaults.
void tile_init_flavour();
void tile_init_flavour(const coord_def &gc);
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 3f4f2534d1..2ab1b577b9 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -347,7 +347,7 @@ bool check_transformation_stat_loss(const std::set<equipment_type> &remove,
bool quiet, int str_loss, int dex_loss,
int int_loss)
{
- // Initialize with additional losses, if any.
+ // Initialise with additional losses, if any.
int prop_str = str_loss;
int prop_dex = dex_loss;
int prop_int = int_loss;
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index ec650dbd3b..275969420b 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -4092,7 +4092,7 @@ runrest::runrest()
{
}
-// Initialize is only called for resting/shift-running. We should eventually
+// Initialise is only called for resting/shift-running. We should eventually
// include travel and wrap it all in.
void runrest::initialise(int dir, int mode)
{
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 66c3f4911c..51191085d8 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -80,8 +80,9 @@ REVISION("$Rev$");
#define MC_ITEM 0x01
#define MC_MONS 0x02
-// Static class members must be initialized outside of the class declaration,
-// or gcc won't define them in view.o and we'll get a linking error.
+// Static class members must be initialised outside of the class
+// declaration, or gcc won't define them in view.o and we'll get a
+// linking error.
const int monster_los::LSIZE = _monster_los_LSIZE;
const int monster_los::L_VISIBLE = 1;
const int monster_los::L_UNKNOWN = 0;
@@ -2233,7 +2234,7 @@ int ray_def::advance(bool shortest_possible, const coord_def *target)
if (!shortest_possible)
return (raw_advance());
- // If we want to minimize the number of moves on the ray, look one
+ // If we want to minimise the number of moves on the ray, look one
// step ahead and see if we can get a diagonal.
const coord_def old(static_cast<int>(accx), static_cast<int>(accy));
@@ -4074,7 +4075,7 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
return (did_map);
}
-// Realize that this is simply a repackaged version of
+// Realise that this is simply a repackaged version of
// stuff::see_grid() -- make certain they correlate {dlb}:
bool mons_near(const monsters *monster, unsigned short foe)
{
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index c30b6de665..d00b4e6881 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1161,7 +1161,7 @@ static bool _xom_send_allies(int sever)
{
bool rc = false;
// The number of allies is dependent on severity, though heavily
- // randomized.
+ // randomised.
int numdemons = sever;
for (int i = 0; i < 3; i++)
numdemons = random2(numdemons + 1);
@@ -2648,7 +2648,7 @@ static bool _xom_summon_hostiles(int sever)
else
{
// The number of demons is dependent on severity, though heavily
- // randomized.
+ // randomised.
int numdemons = sever;
for (int i = 0; i < 3; i++)
numdemons = random2(numdemons+1);