From e1bb489845efa9f05c97f40da7a7bf3e1663541c Mon Sep 17 00:00:00 2001
From: Andrew Thompson <andrew@hijacked.us>
Date: Thu, 23 Jan 2014 12:09:04 -0500
Subject: [PATCH] Make hazards optional via gameplay menu

---
 src/game/scenes/arena.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/game/scenes/arena.c b/src/game/scenes/arena.c
index 5128781f3..fb833b8b5 100644
--- a/src/game/scenes/arena.c
+++ b/src/game/scenes/arena.c
@@ -512,7 +512,10 @@ void arena_tick(scene *scene) {
         har2->delay = ceil(player1->ctrl->rtt / 2.0f);
 
         if(local->state != ARENA_STATE_ENDING && local->state != ARENA_STATE_STARTING) {
-            arena_spawn_hazard(scene);
+            settings *setting = settings_get();
+            if (setting->gameplay.hazards_on) {
+                arena_spawn_hazard(scene);
+            }
         }
 
         if (