- moved several IWAD dependent files into the game_support resource

* sprite offset definitions, which are IWAD dependent * Freedoom's decal overrides * conversation ID definitions for the Strife teasers * the fallback BigFont now can also be loaded by IWADs which declare themselves as GAME_Heretic or GAME_Hexen.
ZDoom · Jul 16, 2019 · 77b1ebe · 77b1ebe
1 parent c64aedb
commit 77b1ebe
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 1 deletion.
diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp
@@ -1583,11 +1583,17 @@ void V_InitFonts()
 
 	if (!(BigFont = V_GetFont("BigFont")))
 	{
-		if (gameinfo.gametype & GAME_Raven)
+		if (Wads.CheckNumForName("FONTB_S") >= 0)
 		{
 			BigFont = new FFont("BigFont", "FONTB%02u", "defbigfont", HU_FONTSTART, HU_FONTSIZE, 1, -1);
 		}
 	}
+
+	if (!BigFont)
+	{
+		// Load the generic fallback if no BigFont is found.
+		BigFont = V_GetFont("BigFont", "ZBIGFONT");
+	}
 
 	if (gameinfo.gametype & GAME_Raven)
 	{

diff --git a/...ic/filter/game-doomstrifechex/bigfont.lmp → wadsrc/static/zbigfont.lmp b/...ic/filter/game-doomstrifechex/bigfont.lmp → wadsrc/static/zbigfont.lmp
diff --git a/...rc/static/filter/doom.freedoom/decaldef.z → ...ra/static/filter/doom.freedoom/decaldef.z b/...rc/static/filter/doom.freedoom/decaldef.z → ...ra/static/filter/doom.freedoom/decaldef.z
diff --git a/wadsrc/static/filter/doom.id/sprofs.txt → ...rc_extra/static/filter/doom.id/sprofs.txt b/wadsrc/static/filter/doom.id/sprofs.txt → ...rc_extra/static/filter/doom.id/sprofs.txt
diff --git a/wadsrc/static/filter/heretic/sprofs.txt → ...rc_extra/static/filter/heretic/sprofs.txt b/wadsrc/static/filter/heretic/sprofs.txt → ...rc_extra/static/filter/heretic/sprofs.txt
diff --git a/wadsrc/static/filter/hexen/sprofs.txt → wadsrc_extra/static/filter/hexen/sprofs.txt b/wadsrc/static/filter/hexen/sprofs.txt → wadsrc_extra/static/filter/hexen/sprofs.txt
diff --git a/wadsrc/static/filter/strife/sprofs.txt → wadsrc_extra/static/filter/strife/sprofs.txt b/wadsrc/static/filter/strife/sprofs.txt → wadsrc_extra/static/filter/strife/sprofs.txt
diff --git a/...strifeteaser1/mapinfo/conversationids.txt → ...a/static/filter/strifeteaser1/mapinfo.txt b/...strifeteaser1/mapinfo/conversationids.txt → ...a/static/filter/strifeteaser1/mapinfo.txt
diff --git a/...strifeteaser2/mapinfo/conversationids.txt → ...a/static/filter/strifeteaser2/mapinfo.txt b/...strifeteaser2/mapinfo/conversationids.txt → ...a/static/filter/strifeteaser2/mapinfo.txt