- handle the case where SBARINFO only contains a mugshot definition a…

…nd fall back to the current statusbarclass if creating an SBARINFO-based statusbar fails.
ZDoom · May 21, 2017 · be2cfdd · be2cfdd
1 parent e27e89b
commit be2cfdd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp
@@ -1576,8 +1576,7 @@ DEFINE_ACTION_FUNCTION(DSBarInfo, GetProtrusion)
 DBaseStatusBar *CreateCustomStatusBar(int scriptno)
 {
 	auto script = SBarInfoScript[scriptno];
-	if (script == NULL)
-		I_FatalError("Tried to create a status bar with no script!");
+	if (script == nullptr) return nullptr;
 
 	auto sbar = (DBaseStatusBar*)PClass::FindClass("SBarInfoWrapper")->CreateNew();
 	auto core = new DSBarInfo(sbar, script);

diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp
@@ -303,6 +303,15 @@ void ST_CreateStatusBar(bool bTitleLevel)
 		{
 			StatusBar = CreateCustomStatusBar(SCRIPT_DEFAULT);
 		}
+		// SBARINFO failed so try the current statusbarclass again.
+		if (StatusBar == nullptr)
+		{
+			auto cls = PClass::FindClass(gameinfo.statusbarclass);
+			if (cls != nullptr)
+			{
+				StatusBar = (DBaseStatusBar *)cls->CreateNew();
+			}
+		}
 	}
 	if (StatusBar == nullptr)
 	{