summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-13 15:57:55 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-13 15:57:55 +0000
commite6525c83826d150eb2a283ce5bf23218cb75f82e (patch)
treeb16a09028c1468efa825975fb1e85a3e4d722bf5 /crawl-ref/source/spells2.cc
parent674a9e64697629cc3266564ea4f8dc7eb2616b50 (diff)
downloadcrawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.tar.gz
crawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.zip
* Add Cannibalism to list of forbidded actions for good gods.
* Add simple warning message (god "did not appreciate that!") when using unID'd items that would otherwise be penalized. * Change protection from harm to be independent of prayer. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2849 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 5ea9631a95..5b1f6b5350 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1,6 +1,7 @@
/*
* File: spells2.cc
* Summary: Implementations of some additional spells.
+ * Mostly Necromancy and Summoning.
* Written by: Linley Henzell
*
* Modified for Crawl Reference by $Author$ on $Date$
@@ -1138,7 +1139,7 @@ char burn_freeze(int pow, char flavour)
{
if (mons_friendly( monster ))
{
- did_god_conduct( DID_ATTACK_FRIEND, 5, monster );
+ did_god_conduct( DID_ATTACK_FRIEND, 5, true, monster );
}
if (mons_holiness( monster ) == MH_HOLY)