summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/describe.cc4
-rw-r--r--crawl-ref/source/files.cc1
-rw-r--r--crawl-ref/source/xom.cc1
3 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 0455c808c8..97f0281497 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3185,7 +3185,7 @@ static std::string _religion_help( god_type god )
// The various titles granted by the god of your choice.
// Note that Xom doesn't use piety the same way as the other gods, so
-// it's completely useless.
+// these are just placeholders.
const char *divine_title[NUM_GODS][8] =
{
// No god
@@ -3210,7 +3210,7 @@ const char *divine_title[NUM_GODS][8] =
// Xom
{"Toy", "Toy", "Toy", "Toy",
- "Toy", "Toy", "Toy", "Teddy Bear"},
+ "Toy", "Toy", "Toy", "Toy"},
// Vehumet -- battle mage theme
{"Meek", "Sorcerer's Apprentice", "Scholar of Destruction", "Caster of Ruination",
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 098b1cd471..472c2558cb 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -1249,7 +1249,6 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode,
place_transiting_items();
}
- // Tell stash-tracker and travel that we've changed levels.
if (load_mode != LOAD_VISITOR)
{
// Tell stash-tracker and travel that we've changed levels.
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 05c94a83e9..0626b35b5f 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -178,7 +178,6 @@ static void _xom_is_stimulated(int maxinterestingness,
interestingness = std::min(255, interestingness);
-#define DEBUG_XOM
#if defined(DEBUG_RELIGION) || defined(DEBUG_GIFTS) || defined(DEBUG_XOM)
mprf(MSGCH_DIAGNOSTICS,
"Xom: gift_timeout: %d, maxinterestingness = %d, interestingness = %d",