From 458899dff720f2bd8954c45b68b54b23c1f51645 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Thu, 9 Jan 2020 23:02:00 +0100
Subject: [PATCH] [hellfire] Remove the color_cycling option

---
 Source/gamemenu.cpp | 2 ++
 Source/gamemenu.h   | 6 ++++++
 Source/palette.cpp  | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index f3be1d812..5a9ab1e4a 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -46,7 +46,9 @@ char *sound_toggle_names[] = { "Sound", "Sound Disabled" };
 #ifdef HELLFIRE
 char *jogging_toggle_names[] = { "Jog", "Walk", "Fast Walk" };
 #endif
+#ifndef HELLFIRE
 char *color_cycling_toggle_names[] = { "Color Cycling Off", "Color Cycling On" };
+#endif
 
 void gamemenu_previous()
 {
diff --git a/Source/gamemenu.h b/Source/gamemenu.h
index 1b52c9e0f..de7b930b2 100644
--- a/Source/gamemenu.h
+++ b/Source/gamemenu.h
@@ -24,7 +24,9 @@ void gamemenu_get_sound();
 #ifdef HELLFIRE
 void gamemenu_jogging();
 #endif
+#ifndef HELLFIRE
 void gamemenu_get_color_cycling();
+#endif
 void gamemenu_get_gamma();
 void gamemenu_music_volume(BOOL bActivate);
 int gamemenu_slider_music_sound(TMenuItem *menu_item);
@@ -34,11 +36,15 @@ void gamemenu_loadjog(BOOL bActivate);
 #endif
 void gamemenu_gamma(BOOL bActivate);
 int gamemenu_slider_gamma();
+#ifndef HELLFIRE
 void gamemenu_color_cycling(BOOL bActivate);
+#endif
 
 /* rdata */
 extern char *music_toggle_names[];
 extern char *sound_toggle_names[];
+#ifndef HELLFIRE
 extern char *color_cycling_toggle_names[];
+#endif
 
 #endif /* __GAMEMENU_H__ */
diff --git a/Source/palette.cpp b/Source/palette.cpp
index d15862492..8bbc949ad 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -393,8 +393,10 @@ BOOL palette_get_colour_cycling()
 	return color_cycling_enabled;
 }
 
+#ifndef HELLFIRE
 BOOL palette_set_color_cycling(BOOL enabled)
 {
 	color_cycling_enabled = enabled;
 	return enabled;
 }
+#endif