Don't let the player starve to death while observing the arena.

ouch() asserts if called while in arena mode.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8077 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 4 insertions, 0 deletions

diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index 9b66a2531d..aac287ac47 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -425,6 +425,8 @@ namespace arena
                 // Move hero offscreen.
                 you.position.y = -1;
                 you.time_taken = 10;
+                // Make sure we don't starve.
+                you.hunger = 10999;
                 //report_foes();
                 world_reacts();
                 delay(Options.arena_delay);
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index ffe58014e5..5a555b7d2b 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -836,6 +836,8 @@ static void _yred_mirrors_injury(int dam, int death_source)
 void ouch(int dam, int death_source, kill_method_type death_type,
           const char *aux, bool see_source)
 {
+    ASSERT(!crawl_state.arena);
+
     ait_hp_loss hpl(dam, death_type);
     interrupt_activity( AI_HP_LOSS, &hpl );