From 421babd7402fc7f030768062ad66227d8bd220d0 Mon Sep 17 00:00:00 2001
From: Matthew Cline <zelgadis@sourceforge.net>
Date: Sat, 14 Nov 2009 22:55:33 -0800
Subject: Fix some arena asserts.

---
 crawl-ref/source/mon-behv.cc | 5 ++++-
 crawl-ref/source/monster.cc  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 01be99300a..8b4956a8a9 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -1458,8 +1458,11 @@ void handle_behaviour(monsters *mon)
             // Foe gone out of LOS?
             if (!proxFoe)
             {
-                if ((isFriendly || proxPlayer) && !isNeutral && !patrolling)
+                if ((isFriendly || proxPlayer) && !isNeutral && !patrolling
+                    && !crawl_state.arena)
+                {
                     new_foe = MHITYOU;
+                }
                 else
                     new_beh = BEH_WANDER;
             }
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index c8f0b8fa7f..8f8df5b8b0 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -55,6 +55,8 @@ monsters::monsters()
       seen_context(""), props()
 {
     travel_path.clear();
+    if (crawl_state.arena)
+        foe = MHITNOT;
 }
 
 // Empty destructor to keep auto_ptr happy with incomplete ghost_demon type.
-- 
cgit v1.2.3-54-g00ecf