summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/abyss.cc2
-rw-r--r--crawl-ref/source/beam.cc4
-rw-r--r--crawl-ref/source/decks.cc2
-rw-r--r--crawl-ref/source/enum.h4
-rw-r--r--crawl-ref/source/files.cc2
-rw-r--r--crawl-ref/source/item_use.cc12
-rw-r--r--crawl-ref/source/misc.cc4
7 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 05f1117227..5bf3c7d763 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -270,7 +270,7 @@ static void xom_check_nearness_setup()
}
// If the player was almost to the exit when it disppeared, Xom is
-// exteremely amused. He's also extremely amused if the player winds
+// extremely amused. He's also extremely amused if the player winds
// up right next to an exit when there wasn't one there before. The
// same applies to Abyssal runes.
static void xom_check_nearness()
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index fe1b1220b4..85258125e7 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3273,7 +3273,7 @@ static int affect_player( bolt &beam )
you_teleport();
// An enemy helping you escape while in the Abyss, or an
- // enemy stabalizing a teleport that was about to happen.
+ // enemy stabilizing a teleport that was about to happen.
if (beam.attitude == ATT_HOSTILE && you.level_type == LEVEL_ABYSS)
xom_is_stimulated(255);
@@ -3519,7 +3519,7 @@ static int affect_player( bolt &beam )
// Beam from player rebounded and hit player
if (beam.beam_source == NON_MONSTER)
xom_is_stimulated(255);
- // Xom's ammusement at the player being damaged is handled
+ // Xom's amusement at the player being damaged is handled
// elsewhere.
else if (was_affected)
xom_is_stimulated(128);
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 0c759cea73..1df11df893 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2031,7 +2031,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
{
if (you.religion == GOD_XOM)
{
- // Being a self-centered diety, Xom *always* finds this
+ // Being a self-centered deity, Xom *always* finds this
// maximally hilarious.
god_speaks(GOD_XOM, "Xom roars with laughter!");
you.gift_timeout = 255;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index ddbc58490c..ed9d2c6525 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -843,13 +843,13 @@ enum dungeon_feature_type
DNGN_STONE_STAIRS_DOWN_I,
DNGN_STONE_STAIRS_DOWN_II,
DNGN_STONE_STAIRS_DOWN_III,
- DNGN_ROCK_STAIRS_DOWN, // 85 - now escape hatch (Stonesoup 0.3)
+ DNGN_ROCK_STAIRS_DOWN, // 85 - now escape hatch (Stonesoup 0.3)
// corresponding up stairs (same order as above)
DNGN_STONE_STAIRS_UP_I,
DNGN_STONE_STAIRS_UP_II,
DNGN_STONE_STAIRS_UP_III,
- DNGN_ROCK_STAIRS_UP, // 89 - now escape hatch (Stonesoup 0.3)
+ DNGN_ROCK_STAIRS_UP, // 89 - now escape hatch (Stonesoup 0.3)
// Various gates
DNGN_ENTER_DIS = 92, // 92
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index b7d7ff2b67..15b693fbf9 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -825,7 +825,7 @@ static void grab_followers()
}
}
-// Should be called afetr grab_followers(), so that items carried by
+// Should be called after grab_followers(), so that items carried by
// followers won't be considered lost.
static void do_lost_items(level_area_type old_level_type)
{
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index ed073cc415..d3fa865f49 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -601,7 +601,7 @@ void wield_effects(int item_wield_2, bool showMsgs)
xom_is_stimulated(128);
miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100,
was_known ? "distortion wield" :
- "uknowning distortion wield");
+ "unknowing distortion wield");
break;
case SPWPN_SINGING_SWORD:
@@ -2928,7 +2928,7 @@ void zap_wand(void)
{
// Xom loves it when you use a Wand of Random Effects and
// there is a dangerous monster nearby...
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
}
@@ -2978,7 +2978,7 @@ void zap_wand(void)
{
// Xom loves it when you use an unknown wand and there is a
// dangerous monster nearby...
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
you.turn_is_over = true;
@@ -3100,7 +3100,7 @@ void drink(void)
{
// Xom loves it when you drink an unknown potion and there is
// a dangerous monster nearby...
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
dec_inv_item_quantity( item_slot, 1 );
@@ -3912,7 +3912,7 @@ void read_scroll(void)
{
// Xom loves it when you read an unknown scroll and there is
// a dangerous monster nearby...
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
} // end read_scroll()
@@ -4001,7 +4001,7 @@ void use_randart(const item_def &item)
{
// Xom loves it when you use an unknown random artefact and
// there is a dangerous monster nearby...
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
}
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index f965824c36..8fa092b0a0 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1160,7 +1160,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
|| entry_cause != EC_SELF_EXPLICIT)
{
if (crawl_state.is_god_acting())
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
else if (entry_cause == EC_SELF_EXPLICIT)
{
// Entering Pandemonium or the Abyss for the first
@@ -1171,7 +1171,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
else if (entry_cause == EC_SELF_RISKY)
xom_is_stimulated(128);
else
- xom_is_stimulated(256);
+ xom_is_stimulated(255);
}
break;