summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-18 19:00:44 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-18 19:00:44 +0000
commita402c85f58bae4b8054f77015007b32e139e880b (patch)
treec58905680eddcf785c5f313b564f216c9bd81691 /crawl-ref
parent31f090ece8bfe69146d5dd1fafd5e3dc01405e67 (diff)
downloadcrawl-ref-a402c85f58bae4b8054f77015007b32e139e880b.tar.gz
crawl-ref-a402c85f58bae4b8054f77015007b32e139e880b.zip
Once again, remove some debugging statements.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9636 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/religion.cc1
-rw-r--r--crawl-ref/source/xom.cc5
2 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index b0bb0dce15..71de0d3f88 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -85,7 +85,6 @@ REVISION("$Rev$");
# define DEBUG_PIETY 1
#endif
-#define DEBUG_PIETY 1
#define PIETY_HYSTERESIS_LIMIT 1
// Item offering messages for the gods:
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 5655e172b7..933a40eab2 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -2541,8 +2541,7 @@ static bool _xom_summon_hostiles(int sever)
const std::string speech = _get_xom_speech("hostile monster");
// Nasty, but fun.
-// if (player_weapon_wielded() && one_chance_in(4))
- if (player_weapon_wielded())
+ if (player_weapon_wielded() && one_chance_in(4))
{
const item_def& weapon = *you.weapon();
const std::string wep_name = weapon.name(DESC_PLAIN);
@@ -2990,7 +2989,7 @@ void xom_acts(bool niceness, int sever, int tension)
const std::string msg = "You are now " + new_xom_favour;
god_speaks(you.religion, msg.c_str());
}
-#ifdef NOTE_DEBUG_XOM
+#ifdef DEBUG_XOM
snprintf(info, INFO_SIZE, "xom_acts(): reroll piety(1/5), piety: %d",
you.piety);
take_note(Note(NOTE_MESSAGE, 0, 0, info), true);