From 8b8f4a7e0af566887a0f5e09b5ac90cf0e45fb1b Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 28 Apr 2008 18:10:10 +0000
Subject: And have Xom use it instead of the fake player torment he currently
 does.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4753 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/effects.cc | 4 ++++
 crawl-ref/source/enum.h     | 3 ++-
 crawl-ref/source/xom.cc     | 5 +----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index a8010d7caf..3ab643cf8b 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -190,6 +190,10 @@ bool torment_player(int pow, int caster)
         case TORMENT_SCROLL:
             aux = "scroll of torment";
             break;
+
+        case TORMENT_XOM:
+            aux = "Xom's torment";
+            break;
         }
 
         caster = TORMENT_GENERIC;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index d34f4c0b58..1e32f9657f 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2609,7 +2609,8 @@ enum torment_source_type
     TORMENT_CARDS = -2,         // Symbol of torment
     TORMENT_SPWLD = -3,         // Special wield torment
     TORMENT_SCROLL = -4,
-    TORMENT_SPELL = -5          // SPELL_SYMBOL_OF_TORMENT
+    TORMENT_SPELL = -5,         // SPELL_SYMBOL_OF_TORMENT
+    TORMENT_XOM = -6            // Xom effect
 };
 
 enum trap_type                         // env.trap_type[]
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 8082dde436..5cb96a7f97 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -840,10 +840,7 @@ static bool xom_is_bad(int sever)
                     drain_exp();
             }
             else
-            {
-                mpr("A wave of agony tears through your body!");
-                set_hp((you.hp / 2) + 1, false);
-            }
+                torment_player(0, TORMENT_XOM);
 
             done = true;
         }
-- 
cgit v1.2.3-54-g00ecf