summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-05 23:07:26 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-05 23:07:40 +0100
commite09a3173a9b2d934f8c095f145fdc0b90bd3f202 (patch)
treef53d380ad2c29d2e6fbdf2ed7f231f35853ede90
parent282bc37721ec3b076e8a4f35d5f6361e591e9698 (diff)
downloadcrawl-ref-e09a3173a9b2d934f8c095f145fdc0b90bd3f202.tar.gz
crawl-ref-e09a3173a9b2d934f8c095f145fdc0b90bd3f202.zip
Fix arena assert.
-rw-r--r--crawl-ref/source/behold.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc
index 37571e1b0a..553c044410 100644
--- a/crawl-ref/source/behold.cc
+++ b/crawl-ref/source/behold.cc
@@ -1,3 +1,8 @@
+/*
+ * File: behold.cc
+ * Summary: player methods dealing with mesmerisation.
+ */
+
#include "AppHdr.h"
#include "player.h"
@@ -9,6 +14,7 @@
#include "mon-util.h"
#include "monster.h"
#include "random.h"
+#include "state.h"
#include "stuff.h"
#include "view.h"
@@ -154,6 +160,8 @@ void player::_removed_beholder()
// beholder.
bool player::_possible_beholder(const monsters *mon) const
{
+ if (crawl_state.arena)
+ return (false);
if (silenced(you.pos()))
return (false);
if (!mon->alive() || !mons_near(mon) || mons_friendly(mon)