[Hide Content]From bc1f8b04a9a4d99cf247867ee0205f994d115a3f Mon Sep 17 00:00:00 2001
From: Zannick <jokeserver@gmail.com>
Date: Wed, 5 Nov 2014 13:23:43 -0800
Subject: [PATCH] Don't dereference non-monster evildoers.
---
crawl-ref/source/player.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 47bc5a0..0e0aef1 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -7235,7 +7235,8 @@ void player::splash_with_acid(const actor* evildoer, int acid_strength,
if (post_res_dam < dam)
canned_msg(MSG_YOU_RESIST);
- ouch(post_res_dam, evildoer->mindex(), KILLED_BY_ACID);
+ ouch(post_res_dam, evildoer ? evildoer->mindex() : NON_MONSTER,
+ KILLED_BY_ACID);
}
}
--
1.7.2.5