From 08838c9cae92734db99f2eaaba0367a58746466b Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Tue, 13 Oct 2020 07:48:49 +0200
Subject: [PATCH] Always use hellfire menu when hellfire is enabled

---
 Source/mainmenu.cpp           | 7 +++++--
 SourceX/DiabloUI/mainmenu.cpp | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index d1a3ebd8f..fa9cccd54 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -115,11 +115,16 @@ void mainmenu_loop()
 			break;
 		case MAINMENU_REPLAY_INTRO:
 		case MAINMENU_ATTRACT_MODE:
+#ifdef HELLFIRE
+			if (gbActive)
+				mainmenu_play_intro();
+#else
 #ifdef SPAWN
 			done = FALSE;
 #else
 			if (gbActive)
 				mainmenu_play_intro();
+#endif
 #endif
 			break;
 		case MAINMENU_SHOW_CREDITS:
@@ -168,7 +173,6 @@ BOOL mainmenu_multi_player()
 	return mainmenu_init_menu(SELHERO_CONNECT);
 }
 
-#ifndef SPAWN
 void mainmenu_play_intro()
 {
 	music_stop();
@@ -179,6 +183,5 @@ void mainmenu_play_intro()
 #endif
 	mainmenu_refresh_music();
 }
-#endif
 
 DEVILUTION_END_NAMESPACE
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp
index d8b897bfd..19ccfd986 100644
--- a/SourceX/DiabloUI/mainmenu.cpp
+++ b/SourceX/DiabloUI/mainmenu.cpp
@@ -56,11 +56,15 @@ void mainmenu_Load(char *name, void (*fnSound)(char *file))
 	SDL_Rect rect = { 17, (SCREEN_HEIGHT - 36), 605, 21 };
 	vecMainMenuDialog.push_back(new UiArtText(name, rect, UIS_SMALL));
 
+#ifndef HELLFIRE
 	if (!gbSpawned) {
+#endif
 		LoadBackgroundArt("ui_art\\mainmenu.pcx");
+#ifndef HELLFIRE
 	} else {
 		LoadBackgroundArt("ui_art\\swmmenu.pcx");
 	}
+#endif
 
 	UiInitList(vecMenuItems.size(), NULL, UiMainMenuSelect, mainmenu_Esc, vecMainMenuDialog, true);
 }