Make arena_delay available outside of arena as view_delay.

So, if you're running a bot or you're generally annoyed by
ranged/magical animations, you can set this to an appropriately low
value.

This also condenses a lot of code duplication related to arena_delay; a
new function called scaled_delay is used for functions that should be
impacted by this.

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index 9652e5e179..ff9a728857 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -351,7 +351,7 @@ namespace arena
 
         const int arena_delay = strip_number_tag(spec, "delay:");
         if (arena_delay >= 0 && arena_delay < 2000)
-            Options.arena_delay = arena_delay;
+            Options.view_delay = arena_delay;
 
         string arena_place = strip_tag_prefix(spec, "arena_place:");
         if (!arena_place.empty())
@@ -821,7 +821,7 @@ namespace arena
                 do_respawn(faction_a);
                 do_respawn(faction_b);
                 balance_spawners();
-                delay(Options.arena_delay);
+                delay(Options.view_delay);
                 mesclr();
                 dump_messages();
                 ASSERT(you.pet_target == MHITNOT);
@@ -1004,7 +1004,7 @@ namespace arena
             do_fight();
 
             if (trials_done < total_trials)
-                delay(Options.arena_delay * 5);
+                delay(Options.view_delay * 5);
         }
         while (!contest_cancelled && trials_done < total_trials);
 
@@ -1015,7 +1015,7 @@ namespace arena
                  faction_b.desc.c_str(), trials_done - team_a_wins - ties,
                  ties);
         }
-        delay(Options.arena_delay * 5);
+        delay(Options.view_delay * 5);
 
         write_results();
     }