summaryrefslogtreecommitdiff
path: root/src/cmd1.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-22 13:05:39 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-22 13:05:39 +0100
commitb11197ae79d621c50d89f6a092a3f95f954712f0 (patch)
tree44b20f31bc6b4f946d2f4fb6c19afdce558a34f2 /src/cmd1.cc
parentfb2a78c52a32026a57fd9cc7763a783456199dd7 (diff)
Inline various GOD macros
Diffstat (limited to 'src/cmd1.cc')
-rw-r--r--src/cmd1.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 96cb3826..2b1b6ea1 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -2465,7 +2465,7 @@ void py_attack(int y, int x, int max_blow)
while (randint(4) == 1);
}
- PRAY_GOD(GOD_TULKAS)
+ if (praying_to(GOD_TULKAS))
{
if (magik(wisdom_scale(130) - m_ptr->level) && (p_ptr->grace > 1000))
{
@@ -2492,7 +2492,7 @@ void py_attack(int y, int x, int max_blow)
}
/* Melkor can cast curse for you*/
- PRAY_GOD(GOD_MELKOR)
+ if (praying_to(GOD_MELKOR))
{
int lv = get_level(MELKOR_CURSE, 100, 1);
@@ -2928,7 +2928,7 @@ bool_ player_can_enter(byte feature)
pass_wall ||
(has_ability(AB_TREE_WALK)) ||
(p_ptr->mimic_form == resolve_mimic_name("Ent")) ||
- ((p_ptr->grace >= 9000) && (p_ptr->praying) && (p_ptr->pgod == GOD_YAVANNA)))
+ ((p_ptr->grace >= 9000) && praying_to(GOD_YAVANNA)))
return (TRUE);
}